Find function add map support