Code refactoring of main indicators. Version upgrade