Added some custom validation