Added custom validations