Update to new API semantics