added more mapping