Refactored Collection to use new Entity base type