Refactored Forms framework.