Many changes to architecture