update to new way of provider mapping