Add some more validation