Changed settings structure