Upgrade to apm 0.88