Type finder changes