Upgrade to apm 0.60