Added new types of entities