commit updates and additions
extended EntityModel to test marshalling with parent class