Added user interactions to message logic