Added more compatibility with express