Add missing forms
Improve Johdin_mA