Extract client interfaces

Change-Id: I758b21838610b37567d69ace29209ef6e0febe4e