Changed logic to use main SS API.

Changed logic so it uses the proper interface to the storage service.