Added upstream message factory