#18: Add Different validator