Updated Wizards logic to support wizards that differ per arch. Issue #372