Added proper symbols to Map