Update for Express 3.0