Changed to support all collections