Moved completion block definitions for model definition service to constants file