Adding some form checks