Add subscription-status and storage-client translation