Return Client instead of Bool for some functions