Updated server, new MessageDictionary class in /common