Changed Wrapper to Client naming, though it's more appropriate