Align DataServiceInterface with the interface convention