adding switch for mapping kind..