Keep 'safe' property as boolean, inject 'w' option