[Upgrade]: Added Components to core gadgets for upgrading