added entity and entity types