:+1:  for moving to EntityManager. This is something we should do all over the place.