Architecture emendations