Minor work on Architect version