Added option 'safe' and removed IDFORMAT
Added option 'safe' and removed IDFORMAT