Hotfix/form factory available in forms