Change the way embedded entities are handled