Added entity and entity_rules