Updated to work with Express 3.x