Modification following the previous commit which implement the new DataManagement namespace