Changes to architecture