Changed some names, added entity_list vector