Added support for other content types