change to new style of validations
Rename model (message -> activity)