Consolidated model classes into a single class