Settings unification: Mark Settings with TODO comment