Upgrade to Airlift 0.95