Numerous changes, in the process of refactoring of the architecture