Fix cli-client, added scope