Made Mappable validation be required as well as notEmpty