Added Server, Message and Mockup