Added legacy dataserver