Extracted Client interface; some renaming