diff --git a/ethosu/vela/register_command_stream_generator.py b/ethosu/vela/register_command_stream_generator.py
index 04f7072..9d79d58 100644
--- a/ethosu/vela/register_command_stream_generator.py
+++ b/ethosu/vela/register_command_stream_generator.py
@@ -55,6 +55,7 @@
 from .architecture_features import Accelerator
 from .architecture_features import ArchitectureFeatures
 from .architecture_features import Block
+from .architecture_features import create_default_arch
 from .architecture_features import Rect
 from .architecture_features import SharedBufferArea
 from .architecture_features import SHRAMElements
@@ -1282,16 +1283,6 @@
     """
     accelerator = Accelerator.from_npu_accelerator(npu_accelerator)
     emit = CommandStreamEmitter()
-    arch = ArchitectureFeatures(
-        vela_config_files=None,
-        accelerator_config=accelerator.value,
-        system_config=ArchitectureFeatures.DEFAULT_CONFIG,
-        memory_mode=ArchitectureFeatures.DEFAULT_CONFIG,
-        override_block_config=None,
-        block_config_limit=None,
-        max_blockdep=ArchitectureFeatures.MAX_BLOCKDEP,
-        weight_estimation_scaling=1.0,
-        verbose_config=False,
-    )
+    arch = create_default_arch(accelerator)
     generate_command_stream(emit, npu_op_list, arch)
     return emit.to_list()