Refactored form dependencies