Adding advanced client handler to give more control to caller