Function-based mapping and analysis
update