Upgrading Chug to ensure component order