Updated domain and service interfaces for review

Change-Id: Id92751fdf927dd22bb5f35e6dd914a8cc308b137