Add missing forms
Refactor rules
Add missing forms