Updated form wizard to use the new polymorphic methods.