Refactored form types