changing interface for clientaware and proxybuilder for setService instead of setClient
fixed merge conflict