Removed dependency to model API.

Change-Id: If7b703c731fdec30ea26a9caea8e9a97331fcac4