Rework to support find by type
Added image