changes for getDataByKey