Added settings from upstream