Added StrictModeWrapper