Move more EntitiesState methods into trait