Refactored type table.