added DataManagement logic