API change: identifier -> handle