Separated the content type handlers from the content types