Added some messages and services