- IMPROVEMENT: All strings mapping
- FIX: Minor fixes