BsDataStorage refactoring