* Add mixin class CollectionEntity for the collection helper * Improve typing * Address review comments * Fix tests