Reverting collection until polymorphism issues have been resolved