Added settings persistence