Refactoring, instead of composition, CStorage now inherits from STL container