Added new entities and services