Changing architecture. Intermediate commit.
Changed architecture