Deal with additional payment behavior fields
Fix templates
Add new fields to the catalog