Add defaultClient functionality