diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
index b83b72e4..b7599b0a 100644
--- a/bsmd.database/DBManagerAsync.cs
+++ b/bsmd.database/DBManagerAsync.cs
@@ -81,7 +81,7 @@ namespace bsmd.database
             MaerskData md = new MaerskData();
             md.PrepareLoadCommand(cmd, Message.LoadFilter.BY_CORE, messageCoreId);
             SqlDataReader reader = await PerformCommandAsync(cmd);
-            List<MaerskData> resultList = await md.LoadListAsync(reader);
+            List<MaerskData> resultList = (await md.LoadListAsync(reader)).ConvertAll(x => (MaerskData) x);
             MaerskData result = null;
             if(resultList.Count > 0)
             {
diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs
index 8e6801b8..02a312f9 100644
--- a/bsmd.database/MaerskData.cs
+++ b/bsmd.database/MaerskData.cs
@@ -19,7 +19,7 @@ namespace bsmd.database
     /// we use a generic storage class called "XtraData" that hopefully might be useful in another
     /// future scenario as well
     /// </summary>
-    public class MaerskData : DatabaseEntity, IEquatable<MaerskData>, IComparable<MaerskData>
+    public class MaerskData : DatabaseEntityAsync, IEquatable<MaerskData>, IComparable<MaerskData>
     {
 
         #region Construction
@@ -124,7 +124,7 @@ namespace bsmd.database
 
         #endregion
 
-        #region abstract DatabaseEntity method implementation
+        #region abstract DatabaseEntityAsync method implementation
 
         public override List<DatabaseEntity> LoadList(IDataReader reader)
         {
@@ -138,23 +138,9 @@ namespace bsmd.database
                 reader.Close();
             }
             return result;
-        }
+        }        
 
-        public async Task<List<MaerskData>> LoadListAsync(SqlDataReader reader)
-        {
-            List<MaerskData> result = new List<MaerskData>();
-            if (reader != null)
-            {
-                while (await reader.ReadAsync())
-                {
-                    result.Add(ReadRowFromReader(reader));
-                }
-                reader.Close();
-            }
-            return result;
-        }
-
-        private MaerskData ReadRowFromReader(IDataReader reader)
+        protected override DatabaseEntityAsync ReadRowFromReader(IDataReader reader)
         {
             MaerskData md = null;
             if (reader != null)