Refactoring to work with new organization + default parameters in default.py.