Refactored the two setting keys into a task key