Type scanner improvements