Updated Validator Logic