Add Suo
Add missing forms
Add missing forms
Remove duplicated code