Use new selection API