BUG-1288: improve InstanceIdentifier API