changes to ServerDataHandler