Updated for Express 4.x support