Remove duplicated code
Remove duplicated code and add missing forms
Remove duplicated code
Add missing forms, remove duplicated code
Remove duplicated code
Add missing forms and remove duplicated code
Add missing forms, remove duplicated code and fix a few errors
Add missing forms and remove duplicated code