Refactored content type lookup generation.