Added calls to storage API