Refactored for museek client protocol support