Added more mapping functions.