refactored BSDataStorage to BSDataStructure