Upgrade to Architect 2.2