Updates to domain and interface definitions

Change-Id: I161fb321161a549194c848a721d76125d783b0e9