Added more upgrades to module class thanks to @xLink