diff --git a/GBase/DataHandling/XmlDataHandler.cs b/GBase/DataHandling/XmlDataHandler.cs
index 83de8eb..b61a2dd 100644
--- a/GBase/DataHandling/XmlDataHandler.cs
+++ b/GBase/DataHandling/XmlDataHandler.cs
@@ -67,20 +67,15 @@ namespace GBase.DataHandling
         /// Initialize the <see cref="XmlDataHandler"/>
         /// </summary>
         /// <param name="overwrite">If true an existing value is overwritten, if false an additional value is added</param>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the async operation</param>
         /// <returns>Returns true if successful, false if not</returns>
-        public async Task<bool> Init(bool overwrite, CancellationToken cancellationToken)
+        public bool Init(bool overwrite)
         {
             if (_isInitialized)
                 return false;
 
             _overwrite = overwrite;
 
-            if (!await _xmlDataReader.Init(cancellationToken))
-                return false;
-
             _isInitialized = true;
-
             return true;
         }
 
@@ -168,11 +163,13 @@ namespace GBase.DataHandling
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/> that implements the property</typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>The value for the given property</returns>
-        public async Task<TProperty> GetValue<T, TProperty>(string propertyName)
+        public async Task<TProperty> GetValue<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken)
         {
-            IEnumerable<TProperty> enumerable = await GetValues<T, TProperty>(propertyName);
+            IEnumerable<TProperty> enumerable = await GetValues<T, TProperty>(file, propertyName, cancellationToken);
             return enumerable == null ? default : enumerable.FirstOrDefault();
         }
 
@@ -181,24 +178,17 @@ namespace GBase.DataHandling
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/> that implements the property</typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>An <see cref="IEnumerable{T}"/> with all the values for the property</returns>
-        public async Task<IEnumerable<TProperty>> GetValues<T, TProperty>(string propertyName)
+        public async Task<IEnumerable<TProperty>> GetValues<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken)
         {
             IEnumerable<TProperty> cachedValues = await _cache.TryGetValues<T, TProperty>(propertyName);
             if (cachedValues != null)
                 return cachedValues;
 
-            return await _xmlDataReader.Read<T, TProperty>(propertyName);
-        }
-
-        /// <summary>
-        /// Dispose used resources asynchronously
-        /// </summary>
-        /// <returns>A <see cref="ValueTask"/> to await</returns>
-        public async ValueTask DisposeAsync()
-        {
-            await _xmlDataReader.DisposeAsync();
+            return await _xmlDataReader.Read<T, TProperty>(file, propertyName, cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/GBase/DataHandling/XmlDataReader.cs b/GBase/DataHandling/XmlDataReader.cs
index 03b7396..e83ba65 100644
--- a/GBase/DataHandling/XmlDataReader.cs
+++ b/GBase/DataHandling/XmlDataReader.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using GBase.DataHandling.Exceptions;
 using GBase.Helpers;
 using GBase.Interfaces.DataHandling;
 using GBase.Interfaces.DataHandling.Xml;
@@ -21,65 +22,34 @@ namespace GBase.DataHandling
     /// </summary>
     public class XmlDataReader : IXmlDataReader
     {
-        private readonly FileStream _file;
-        private XDocument _xmlDocument;
-        private XElement _rootElement;
-
-        private bool _isInitialized;
-        private CancellationToken _cancellationToken;
-
-        /// <summary>
-        /// A <see cref="IDataReader"/> that reads from a xml file
-        /// </summary>
-        /// <param name="path">The path to the xml file</param>
-        public XmlDataReader(string path)
-        {
-            _file = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-        }
-
-        /// <summary>
-        /// Initialize the <see cref="XmlDataReader"/>
-        /// </summary>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the async operation</param>
-        /// <returns>Returns true if successful, false if not</returns>
-        /// <exception cref="Exception">No root element found</exception>
-        public async Task<bool> Init(CancellationToken cancellationToken)
-        {
-            if (_isInitialized)
-                return false;
-
-            _cancellationToken = cancellationToken;
-            _xmlDocument = await XDocument.LoadAsync(_file, LoadOptions.None, _cancellationToken);
-
-            _rootElement = _xmlDocument.Root;
-            if (_rootElement == null)
-                throw new Exception("No root element found.");
-
-            _isInitialized = true;
-
-            return true;
-        }
-
         /// <summary>
         /// Read the data of a property
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/></typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>The data of the given property, null if no data found</returns>
         /// <exception cref="ArgumentNullException"><paramref name="propertyName"/></exception>
         /// <exception cref="InvalidOperationException">Invalid <see cref="Type"/> found for the read object</exception>
-        public async Task<IEnumerable<TProperty>> Read<T, TProperty>(string propertyName)
+        public async Task<IEnumerable<TProperty>> Read<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken)
         //TODO: Read currently doesn't work for newly added items -> probably because file was loaded before new items were added; is probably not a problem -> cache
         {
             string typeName = typeof(T).FullName;
             if (typeName == null)
                 throw new ArgumentNullException(nameof(typeName));
 
+            XDocument xmlDocument = await XDocument.LoadAsync(file, LoadOptions.None, cancellationToken);
+            file.Seek(0, SeekOrigin.Begin); //reset stream to it's beginning to be able to save it
+            
             return await Task.Run(() =>
             {
-                XElement typeElement = _rootElement.Element(typeName);
-                XElement propertyElement = typeElement?.Element(propertyName);
+                XElement rootElement = xmlDocument.Root;
+                if (rootElement == null)
+                    throw new InvalidXmlFileException("No root element is set.");
+                
+                XElement propertyElement = rootElement.Element(propertyName);
                 XAttribute propertyTypeAttribute = propertyElement?.Attribute(XmlDataHandler.VALUE_TYPE_ATTRIBUTE_NAME);
                 if (propertyTypeAttribute == null)
                     return null;
@@ -98,16 +68,7 @@ namespace GBase.DataHandling
                     return values.Select(Enumerables.ConvertToGBaseEnumerable<TProperty>).ToList();
 
                 return values.Select(value => (TProperty)Convert.ChangeType(value, typeof(TProperty))).ToList();
-            }, _cancellationToken);
-        }
-
-        /// <summary>
-        /// Dispose used resources asynchronously
-        /// </summary>
-        /// <returns>A <see cref="ValueTask"/> to await</returns>
-        public async ValueTask DisposeAsync()
-        {
-            await _file.DisposeAsync();
+            }, cancellationToken);
         }
     }
 }
\ No newline at end of file
diff --git a/GBase/Interfaces/DataHandling/IDataHandler.cs b/GBase/Interfaces/DataHandling/IDataHandler.cs
index 7ff4d30..afab835 100644
--- a/GBase/Interfaces/DataHandling/IDataHandler.cs
+++ b/GBase/Interfaces/DataHandling/IDataHandler.cs
@@ -13,15 +13,14 @@ namespace GBase.Interfaces.DataHandling
     /// <summary>
     /// Interface for data handlers to implement
     /// </summary>
-    public interface IDataHandler : IAsyncDisposable
+    public interface IDataHandler
     {
         /// <summary>
         /// Initialize the <see cref="IDataHandler"/>
         /// </summary>
         /// <param name="overwrite">If true an existing value is overwritten, if false an additional value is added</param>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the async operation</param>
         /// <returns>Returns true if successful, false if not</returns>
-        Task<bool> Init(bool overwrite, CancellationToken cancellationToken);
+        bool Init(bool overwrite);
 
         Task<bool> AddEntry<T>(T entry, IGBaseTable table, FileStream entryFile, CancellationToken cancellationToken);
 
@@ -37,8 +36,7 @@ namespace GBase.Interfaces.DataHandling
         /// <param name="value">The value to set</param>
         /// <param name="cancellationToken"></param>
         /// <returns>A <see cref="Task"/> to await</returns>
-        Task SetValue<T, TProperty>(FileStream entryFile, string propertyName, TProperty value,
-            CancellationToken cancellationToken);
+        Task SetValue<T, TProperty>(FileStream entryFile, string propertyName, TProperty value, CancellationToken cancellationToken);
 
         /// <summary>
         /// Remove the value for the given property
@@ -50,25 +48,28 @@ namespace GBase.Interfaces.DataHandling
         /// <param name="value">The value to set</param>
         /// <param name="cancellationToken"></param>
         /// <returns>A <see cref="Task"/> to await</returns>
-        Task RemoveValue<T, TProperty>(FileStream entryFile, string propertyName, TProperty value,
-            CancellationToken cancellationToken);
+        Task RemoveValue<T, TProperty>(FileStream entryFile, string propertyName, TProperty value, CancellationToken cancellationToken);
 
         /// <summary>
         /// Get the value for the given property, if multiple values are set the first is returned
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/> of the property</typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>The value for the given property</returns>
-        Task<TProperty> GetValue<T, TProperty>(string propertyName);
+        Task<TProperty> GetValue<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken);
 
         /// <summary>
         /// Get all the values that are set for the given property
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/> of the property</typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>An <see cref="IEnumerable{T}"/> with all the values for the property</returns>
-        Task<IEnumerable<TProperty>> GetValues<T, TProperty>(string propertyName);
+        Task<IEnumerable<TProperty>> GetValues<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/GBase/Interfaces/DataHandling/IDataReader.cs b/GBase/Interfaces/DataHandling/IDataReader.cs
index e6d34da..cacdfb5 100644
--- a/GBase/Interfaces/DataHandling/IDataReader.cs
+++ b/GBase/Interfaces/DataHandling/IDataReader.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -12,22 +13,17 @@ namespace GBase.Interfaces.DataHandling
     /// <summary>
     /// Interface for data readers to implement
     /// </summary>
-    public interface IDataReader : IAsyncDisposable
+    public interface IDataReader
     {
-        /// <summary>
-        /// Initialize the <see cref="IDataReader"/>
-        /// </summary>
-        /// <param name="cancellationToken">A <see cref="CancellationToken"/> to cancel the async operation</param>
-        /// <returns>Returns true if successful, false if not</returns>
-        Task<bool> Init(CancellationToken cancellationToken);
-
         /// <summary>
         /// Read the data of a property
         /// </summary>
         /// <typeparam name="T">The <see cref="Type"/></typeparam>
         /// <typeparam name="TProperty">The <see cref="Type"/> of the property</typeparam>
+        /// <param name="file"></param>
         /// <param name="propertyName">The name of the property</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>The data of the given property, null if no data found</returns>
-        Task<IEnumerable<TProperty>> Read<T, TProperty>(string propertyName);
+        Task<IEnumerable<TProperty>> Read<T, TProperty>(FileStream file, string propertyName, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file