Rename  and  funcmap functions to  and . Add ,  and  funcmap functions