Moved more messages to config