added new validator - refactored adding messages