update to new mapping api