Preparation for extra settings/persistence features