changes for data Management