Update architecture with rewrite.