Added some messages and handlers.