Upgrade from express 2 to 3