Update to handle:id pair storage.