Added more variables to form component