Bug 1048 - Removed dependency on model-flow-service