Changed to support all collections
Changed to support all collections