Added FormValidator class