Added support for content types