added changes to entities and new entities