Update to Architect 2.2