Upgrade to Chaos 0.4.7