Upgrade to architect 2.2.1