Feature 10962 Refactoring of osmclient commands