Added support for content