Added external validations with filtering