Moved Client calls to an interface