Added upgrade infrastructure