Bunch of client API review