client refactor: move methods to super class