Further work on DataManager actions immplementation