Actualized client part, created min and full versions
Fixed bug after refactoring