reworked data service