Switch to using Addressable