Added more entity classes