Add content type support and extra files download