Add ability to override content_type through options mechanism