[#WIZ-256] Support for XDS | storage