Moving onBehalfOf into Client constructor