Refactored string and symbol mapping