Removed data_manager key and using the generic key.