Added custom validations support