Upgrade to apm 0.80