Added some more validation