Change settings architecture to be deployement-ready