Adding lot of stuff about plugins, upgrade, flags, etc etc.