Removed content type fallbacks, refactorings