Add some validation