Move client worker methods to correct position again

The merge of !439 (merged) into the master branch reverted the changes of !472 (merged). This MR adds them again.