Added some multiple choice validation