Final Service design fixes