Added DataServer and a few methods.