Added more mapping