model now returns Entity or EntityCollection