Refactoring as well as client list support