#488 Adding scope control on per client basis