[IMPROVED] Advanced upgrade structure