Major update for Architect 1.7