Update keep to use refactored client