Move filter callbacks to the class

This ensures that we can remove the filters at a later date.