Added missing entity classes