Renamed Id properties to Id, added constructors to models