initial patch for symbol storage refactoring