Further integration of validations