Symbols refactor