Update to work with refactored client