Updated settings to include advanced settings