Refactoring: Removed global static DatasetInfo