Fixes #11 : Modify the Content Handler to match our needs.