Upgrade to apm 0.81