Adding settings handling for upgrade