Move polymorphism code to colander branch