Added message channel through the C.Server. Code cleanup.