Update for API changes
Update for client-connection branch
Signed-off-by: Chris Sanders <zidane@outlook.com>