Updated to work with express 4