Add safe to DEFAULTS