Additional changes to Upstream Filter