Fixes a bug where the defaults weren't overridden in the constructor
Reorder the imports