started rework of data object for new server model