before adapting StorageHandler