Changed the validation to take into account the changes from Semantika, which might be reversed, but it has made the client a little more flexible