Added routing for entities in the system