Module uupdates. Added ModuleRaii.