Add support for more content types