Addjusted Archetype to new Run Mojo #16