Added MAP Validator