REP-729 Add Header Filter

It just looked weird with a private class UpdateListener in there. The class hierarchy makes it make a little sense.