Handle settings better