Fully adapt to Express 4