Refactored Map and Interpreter