Added messages and states