Updated Advanced Validation