Improve validation demo