Improve mapping for blobs functions.
Improve mapping for trees functions.