Moved settings to a separate module