Modified for type search