added features for mapping