Added messages and warnings