Simplify funciton dispatch in CLI