Refactored CqlClient -> Client