Fixed parsing of entity_info