Add mapping for current function info
Update submodules