Improve contract between Daemon and StorageService