Add basic support for content types