Updated Models - added composition fields and validators