client: made usage more standard