Added new entities and pagination