Add missing forms
Add missing forms
Fix bugs
Add missing compound