Upgrade to Moped 2.x