Added entity_id