Added both modules and form validation method