Code updated for Express 4.x