added some mapping