Add some validation stuff