Moved some property into the DataServer trait.