Working on some modules
Before changes to make dump work
Changes to make dump work