Changes how default params are sent
Reorganized internals