Updated to work with Express 4