Removed template code
Made collection actually usable