refactor datamap to stop data translation