Updated for Asterix change to remove IStorageComponentProvider