Updated Database ImportExport to use Switch Component when enabled