Add some custom validation