Adding some basic data types to models

Change-Id: I159cc94bfee46c2b4fb9f271e0957d89a84d4b66