separate diamond-client