Start refactoring messaging to make more generic