SWF Mastah logging improvement