Restructure RunMode to accommodate export use-case