added mapping features