Make common.js call return singleton right away
Changing require for logger in modules