Generic Content Handler refactor