Settings framework update