Add conditional map API