Restored optional support for offlineAddresses