Added FormWrapper generator