Rework base type lookup