New branch for service models

Change-Id: Ic3ff7ed2d58aeb16d145814693b7f5158a3902f1
Models refactored

Change-Id: I6abe48c3d54b643d2042e41d4d07b748d3072ef0
More refactoring

Change-Id: Id7a89b02158120707b31770a837cbb6bdadce0a2
Bug fix

Change-Id: I7ad211c1b1e848cb097ee71c1c11df918835c88f