EntityCollection: $entity can now be a callback