Client router improvements