Initial port to Express 3.x