Use adapter class decorator instead
Merge z3cform concurrent work