Made Client API more consistent with its server counterpart.