Added refactored form file.