Make sure all options are added during upgrade