Updated for express v4.x.x