client-extras now is a class