Add missing forms
Update from Joukahainen