Added client proxy
Added unittest and fixed problems