Testing new validator
Changes for new validator