Updated for latest release of RestExpress, etc.