Settings framework improvements