Preparing for settings integration