So we will replace old option key with new (BC-break) or maintain two options (ugly)