diff --git a/src/LLTSharp/LLTParser.cs b/src/LLTSharp/LLTParser.cs
index 435c7fc..b7f0197 100644
--- a/src/LLTSharp/LLTParser.cs
+++ b/src/LLTSharp/LLTParser.cs
@@ -703,23 +703,21 @@ private static void DeclareMainRules(ParserBuilder builder)
 
 					var obj = v.GetValue<TemplateDictionaryAccessor>(2);
 					var metadata = new List<IMetadata>();
-					var additionalMetadata = new AdditionalMetadata();
 
 					foreach (var pair in obj.Dictionary)
 					{
 						IMetadata? result = null;
+
 						foreach (var factory in factories)
 							if (factory.TryCreateMetadata(pair.Key, pair.Value, out result))
 								break;
+
 						if (result != null)
 							metadata.Add(result);
 						else
-							additionalMetadata.Set(pair.Key, pair.Value.GetValue());
+							metadata.Add(new AdditionalMetadata(pair.Key, pair.Value.GetValue()));
 					}
 
-					if (additionalMetadata.Count > 0)
-						metadata.Add(additionalMetadata.ToImmutable());
-
 					return new MetadataCollection(metadata);
 				});
 
diff --git a/src/LLTSharp/LLTSharp.csproj b/src/LLTSharp/LLTSharp.csproj
index 44b8b38..e27d404 100644
--- a/src/LLTSharp/LLTSharp.csproj
+++ b/src/LLTSharp/LLTSharp.csproj
@@ -8,7 +8,7 @@
 
 	<PropertyGroup>
 		<PackageId>LLTSharp</PackageId>
-		<Version>1.2.4</Version>
+		<Version>1.3.0</Version>
 		<Authors>Roman K.</Authors>
 		<Company>RomeCore</Company>
 		<Product>LLTSharp</Product>
diff --git a/src/LLTSharp/Metadata/AdditionalMetadata.cs b/src/LLTSharp/Metadata/AdditionalMetadata.cs
index 67e59a3..3af9afe 100644
--- a/src/LLTSharp/Metadata/AdditionalMetadata.cs
+++ b/src/LLTSharp/Metadata/AdditionalMetadata.cs
@@ -9,208 +9,43 @@ namespace LLTSharp.Metadata
 	/// <summary>
 	/// Represents a dynamic metadata object that can store additional properties at runtime.
 	/// </summary>
-	public class AdditionalMetadata : DynamicObject, IAdditionalMetadata
+	public class AdditionalMetadata : IAdditionalMetadata, IEquatable<AdditionalMetadata>, IEquatable<IAdditionalMetadata>
 	{
-		private readonly Dictionary<string, object> _metadata = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+		public string Key { get; }
 
-		/// <summary>
-		/// Gets a shared immutable empty instance of additional metadata object.
-		/// </summary>
-		public static IAdditionalMetadata Empty => ImmutableAdditionalMetadata.Empty;
-
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public object this[string key]
-		{
-			get => _metadata.TryGetValue(key, out var value) ? value : null;
-			set => _metadata[key] = value;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AdditionalMetadata"/> class.
-		/// </summary>
-		public AdditionalMetadata()
-		{
-		}
+		public object? Value { get; }
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="AdditionalMetadata"/> class with initial key-value pair.
 		/// </summary>
 		/// <param name="key">The key of the initial metadata item.</param>
 		/// <param name="value">The value of the initial metadata item.</param>
-		public AdditionalMetadata(string key, object value)
-		{
-			_metadata[key] = value;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AdditionalMetadata"/> class with dictionary of initial values.
-		/// </summary>
-		/// <param name="initialValues">Dictionary containing initial metadata values.</param>
-		public AdditionalMetadata(IDictionary<string, object> initialValues)
-		{
-			if (initialValues != null)
-			{
-				foreach (var kvp in initialValues)
-				{
-					_metadata[kvp.Key] = kvp.Value;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AdditionalMetadata"/> class with collection of key-value pairs.
-		/// </summary>
-		/// <param name="initialValues">Collection of key-value pairs for initial metadata.</param>
-		public AdditionalMetadata(IEnumerable<KeyValuePair<string, object>> initialValues)
-		{
-			if (initialValues != null)
-			{
-				foreach (var kvp in initialValues)
-				{
-					_metadata[kvp.Key] = kvp.Value;
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		/// <typeparam name="T">The type to convert the value to.</typeparam>
-		/// <param name="key">The key of the value to get.</param>
-		/// <returns>The converted value or default(T) if not found.</returns>
-		public T Get<T>(string key)
+		public AdditionalMetadata(string key, object? value)
 		{
-			if (_metadata.TryGetValue(key, out var value))
-			{
-				try
-				{
-					return (T)Convert.ChangeType(value, typeof(T));
-				}
-				catch
-				{
-					return default;
-				}
-			}
-			return default;
+			Key = key;
+			Value = value;
 		}
 
-		/// <summary>
-		/// Tries to get the value associated with the specified key.
-		/// </summary>
-		/// <typeparam name="T">The type to convert the value to.</typeparam>
-		/// <param name="key">The key of the value to get.</param>
-		/// <param name="value">When this method returns, contains the value if found; otherwise, default(T).</param>
-		/// <returns>true if the key was found; otherwise, false.</returns>
-		public bool TryGet<T>(string key, out T value)
-		{
-			if (_metadata.TryGetValue(key, out var objValue))
-			{
-				try
-				{
-					value = (T)Convert.ChangeType(objValue, typeof(T));
-					return true;
-				}
-				catch
-				{
-					value = default;
-					return false;
-				}
-			}
-			value = default;
-			return false;
-		}
-
-		/// <summary>
-		/// Adds or updates a metadata value.
-		/// </summary>
-		/// <param name="key">The key of the value to set.</param>
-		/// <param name="value">The value to set.</param>
-		public void Set(string key, object value)
-		{
-			_metadata[key] = value;
-		}
-
-		/// <summary>
-		/// Determines whether the metadata contains the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate.</param>
-		/// <returns>true if the metadata contains the key; otherwise, false.</returns>
-		public bool ContainsKey(string key)
-		{
-			return _metadata.ContainsKey(key);
-		}
-
-		/// <summary>
-		/// Removes the value with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to remove.</param>
-		/// <returns>true if the element was found and removed; otherwise, false.</returns>
-		public bool Remove(string key)
-		{
-			return _metadata.Remove(key);
-		}
-
-		/// <summary>
-		/// Gets all the keys in the metadata.
-		/// </summary>
-		public IEnumerable<string> Keys => _metadata.Keys;
-
-		/// <summary>
-		/// Gets all the values in the metadata.
-		/// </summary>
-		public IEnumerable<object> Values => _metadata.Values;
-
-		/// <summary>
-		/// Gets the number of metadata items.
-		/// </summary>
-		public int Count => _metadata.Count;
-
-		/// <summary>
-		/// Clears all metadata.
-		/// </summary>
-		public void Clear()
-		{
-			_metadata.Clear();
-		}
-
-		/// <summary>
-		/// Converts this instance to immutable copy.
-		/// </summary>
-		public ImmutableAdditionalMetadata ToImmutable()
-		{
-			return new ImmutableAdditionalMetadata(_metadata);
-		}
-
-		public override bool TryGetMember(GetMemberBinder binder, out object result)
-		{
-			return _metadata.TryGetValue(binder.Name, out result);
-		}
-
-		public override bool TrySetMember(SetMemberBinder binder, object value)
+		public override bool Equals(object? obj)
 		{
-			_metadata[binder.Name] = value;
-			return true;
+			return obj is AdditionalMetadata other && Equals(other);
 		}
 
-		public override IEnumerable<string> GetDynamicMemberNames()
+		public bool Equals(AdditionalMetadata? other)
 		{
-			return _metadata.Keys;
+			return other != null && Key == other.Key && Value == other.Value;
 		}
 
-		public override bool Equals(object? obj)
+		public bool Equals(IAdditionalMetadata? other)
 		{
-			return obj is AdditionalMetadata other &&
-				DictionaryUtils.DictionariesEqual(_metadata, other._metadata);
+			return other != null && Key == other.Key && Value == other.Value;
 		}
 
 		public override int GetHashCode()
 		{
 			int hash = 17;
-			hash = hash * 397 + DictionaryUtils.GetDictionaryHashCode(_metadata);
+			hash = hash * 397 + Key.GetHashCode();
+			hash = hash * 397 + (Value?.GetHashCode() ?? 0);
 			return hash;
 		}
 	}
diff --git a/src/LLTSharp/Metadata/IAdditionalMetadata.cs b/src/LLTSharp/Metadata/IAdditionalMetadata.cs
index 4912e5d..20b6f23 100644
--- a/src/LLTSharp/Metadata/IAdditionalMetadata.cs
+++ b/src/LLTSharp/Metadata/IAdditionalMetadata.cs
@@ -6,25 +6,18 @@
 namespace LLTSharp.Metadata
 {
 	/// <summary>
-	/// Represents a dynamic metadata object that can store additional properties at runtime.
+	/// Represents a custom metadata object.
 	/// </summary>
-	public interface IAdditionalMetadata : IMetadata, IDynamicMetaObjectProvider
+	public interface IAdditionalMetadata : IMetadata
 	{
 		/// <summary>
-		/// Gets the value associated with the specified key.
+		/// Gets the key associated with this metadata.
 		/// </summary>
-		/// <typeparam name="T">The type to convert the value to.</typeparam>
-		/// <param name="key">The key of the value to get.</param>
-		/// <returns>The converted value or default(T) if not found.</returns>
-		T Get<T>(string key);
+		string Key { get; }
 
 		/// <summary>
-		/// Tries to get the value associated with the specified key.
+		/// Gets the value associated with this metadata.
 		/// </summary>
-		/// <typeparam name="T">The type to convert the value to.</typeparam>
-		/// <param name="key">The key of the value to get.</param>
-		/// <param name="value">When this method returns, contains the value if found; otherwise, default(T).</param>
-		/// <returns>true if the key was found; otherwise, false.</returns>
-		bool TryGet<T>(string key, out T value);
+		object? Value { get; }
 	}
 }
\ No newline at end of file
diff --git a/src/LLTSharp/Metadata/ImmutableAdditionalMetadata.cs b/src/LLTSharp/Metadata/ImmutableAdditionalMetadata.cs
deleted file mode 100644
index 2212adb..0000000
--- a/src/LLTSharp/Metadata/ImmutableAdditionalMetadata.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Text;
-using LLTSharp.Utils;
-
-namespace LLTSharp.Metadata
-{
-	/// <summary>
-	/// Represents an immutable dynamic metadata object.
-	/// </summary>
-	public class ImmutableAdditionalMetadata : DynamicObject, IAdditionalMetadata
-	{
-		private readonly Dictionary<string, object> _metadata;
-
-		/// <summary>
-		/// Gets a shared immutable empty instance of additional metadata object.
-		/// </summary>
-		public static ImmutableAdditionalMetadata Empty { get; } = new ImmutableAdditionalMetadata();
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ImmutableAdditionalMetadata"/> class.
-		/// </summary>
-		public ImmutableAdditionalMetadata()
-		{
-			_metadata = new Dictionary<string, object>();
-		}
-
-		/// <summary>
-		/// Initializes a new instance with initial key-value pair.
-		/// </summary>
-		public ImmutableAdditionalMetadata(string key, object value)
-		{
-			_metadata = new Dictionary<string, object>();
-			_metadata.Add(key, value);
-		}
-
-		/// <summary>
-		/// Initializes a new instance with dictionary of initial values.
-		/// </summary>
-		public ImmutableAdditionalMetadata(IDictionary<string, object> initialValues)
-		{
-			_metadata = initialValues?.ToDictionary(k => k.Key, v => v.Value);
-		}
-
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		public object this[string key] => _metadata.TryGetValue(key, out var value) ? value : null;
-
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		public T Get<T>(string key)
-		{
-			if (_metadata.TryGetValue(key, out var value))
-			{
-				try
-				{
-					return (T)Convert.ChangeType(value, typeof(T));
-				}
-				catch
-				{
-					return default;
-				}
-			}
-			return default;
-		}
-
-		/// <summary>
-		/// Tries to get the value associated with the specified key.
-		/// </summary>
-		public bool TryGet<T>(string key, out T value)
-		{
-			if (_metadata.TryGetValue(key, out var objValue))
-			{
-				try
-				{
-					value = (T)Convert.ChangeType(objValue, typeof(T));
-					return true;
-				}
-				catch
-				{
-					value = default;
-					return false;
-				}
-			}
-			value = default;
-			return false;
-		}
-
-		/// <summary>
-		/// Determines whether the metadata contains the specified key.
-		/// </summary>
-		public bool ContainsKey(string key) => _metadata.ContainsKey(key);
-
-		/// <summary>
-		/// Gets all the keys in the metadata.
-		/// </summary>
-		public IEnumerable<string> Keys => _metadata.Keys;
-
-		/// <summary>
-		/// Gets all the values in the metadata.
-		/// </summary>
-		public IEnumerable<object> Values => _metadata.Values;
-
-		/// <summary>
-		/// Gets the number of metadata items.
-		/// </summary>
-		public int Count => _metadata.Count;
-
-		public override bool TryGetMember(GetMemberBinder binder, out object result)
-		{
-			return _metadata.TryGetValue(binder.Name, out result);
-		}
-
-		public override IEnumerable<string> GetDynamicMemberNames()
-		{
-			return _metadata.Keys;
-		}
-
-		public override bool Equals(object? obj)
-		{
-			return obj is ImmutableAdditionalMetadata other &&
-				DictionaryUtils.DictionariesEqual(_metadata, other._metadata);
-		}
-
-		public override int GetHashCode()
-		{
-			int hash = 17;
-			hash = hash * 397 + DictionaryUtils.GetDictionaryHashCode(_metadata);
-			return hash;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/LLTSharp/Metadata/MetadataExtensions.cs b/src/LLTSharp/Metadata/MetadataExtensions.cs
index bfc48f8..05af310 100644
--- a/src/LLTSharp/Metadata/MetadataExtensions.cs
+++ b/src/LLTSharp/Metadata/MetadataExtensions.cs
@@ -30,12 +30,9 @@ public static MetadataCollection ToMetadataCollection<T>(this IEnumerable<T> enu
 		public static T? TryGetAdditional<T>(this IMetadataCollection collection, string key)
 		{
 			foreach (var metadata in collection.GetAll<IAdditionalMetadata>())
-			{
-				if (metadata.TryGet<T>(key, out var result))
-				{
-					return result;
-				}
-			}
+				if (metadata.Key == key)
+					if (metadata.Value is T value)
+						return value;
 
 			return default;
 		}