Move Content-Type filtering into a seperate class