Latest changes
Updates interface to use  client object