Refactoring and adding settings to core data