Updated with system setting addition