Upgrade modules part 1