Additional changes in architecture part