Added subclasses for each entity in the model