Be more descriptive with content type (issue #1)