Updated to use latest express defintions