Added upgrade support