Message: Validation refactoring