Added upstream handler