Added basic content type handling