Upgrade to simple 0.10