Client interface optimization

#With master branch#

-- This is difference