Fixed client api impl