Updates to work w/ Express 4