Refactoring. Chat bot updates