Added back safe Data Settings