added missing changes to DataSingleton