Support upcoming Express 5.0