add function/mapping/command and fix unite mapping