Models refactored

Change-Id: I6abe48c3d54b643d2042e41d4d07b748d3072ef0