added remaining Entityclasses with basic implementation