Working on models

Change-Id: Ia1e46b4e874a8a3170686a596da3546eebec4689