Updated for Express 4.1.2