Add nested client call support