Symbol refactor