Improve compounding rules
Add missing forms
Add missing forms