Changing Collection to a templated class