add some more mapping