Symbol module refactoring