PIM-1597 Update routing, uses object manager instead of EntityManager