diff --git a/testdata/aegis_export.json b/testdata/aegis_export.json
index 821c98e1..f5ff8548 100644
--- a/testdata/aegis_export.json
+++ b/testdata/aegis_export.json
@@ -4,31 +4,22 @@
         "slots": [
             {
                 "type": 1,
-                "uuid": "faa80a1d-1f64-4983-90c8-67d8b0a09509",
-                "key": "4ecda6896ea0713e270021c6e7878765a2569fa00f1e12ebd65c866ee1738bde",
+                "uuid": "a61de6ba-32df-4255-957e-ae8906b95005",
+                "key": "b40c6151822db86a9da0298259c049a508f716f0076511ba2dc65f794071613a",
                 "key_params": {
-                    "nonce": "d7bfdff7de45aa7c6166d595",
-                    "tag": "07dedd167226d49a1fca347ef0d0f885"
+                    "nonce": "f34a5ac011e908c817365946",
+                    "tag": "8a8ad4d9b15258f2f170650032beb0b1"
                 },
                 "n": 32768,
                 "r": 8,
                 "p": 1,
-                "salt": "20b7f2a7029f3d35b5fa3cf0435414f8a8b84099b93cf75ee4871b266b2b5e27"
-            },
-            {
-                "type": 2,
-                "uuid": "b56dcbd4-0533-4288-8119-6dc2ef82d23b",
-                "key": "f32f816e1d43099832c7a23110f1349304ea1489ff65ce6e29ea79c0d42d38f4",
-                "key_params": {
-                    "nonce": "65b342b6780c02d1d22b1505",
-                    "tag": "940a05c01838a6f1163f984c38f58c1e"
-                }
+                "salt": "3fa5200a3817933ed6d962370e5332b9905e2e13023935d1918e4b9e890fb588"
             }
         ],
         "params": {
-            "nonce": "5598c18c429ce521f46c68ab",
-            "tag": "60d612995b5d44f8be41399dad3d2734"
+            "nonce": "aa3e68aa6f18e78dc13edaf3",
+            "tag": "8afcb2f93f6a36e6866c898adb201821"
         }
     },
-    "db": "ILPzlJEAurVJJUrCgUDDLrkz4Yy45HhUPumMwr3Us0rC8NHMQgVmJcEKxxq7zPfBdOBWS\/hv0sj1PmqlHi4c0rAN0rXQqKcT7beK7QaszVRq8kW0gfV7PwN9uF+am9IKBVgs\/mtCec1S1eFMHDcU+mawfwNAea7n0dM+eLk89gBp2kiMBlCYW3f+ucjLgicUX2Rl8hiThZSrhK\/UCxmOO4hPLO0\/viVgpFy9y3V+LOefpJHdYyd6wymKSXx6cDX9iiVqczc2jM9RRazZ9ve6Ks2rndZvmIsmOugAXXS3f2\/Q9iLcXBO4y39O3v9h7nfugl5\/NbwL\/JQrPT8bcEAI9x1uoVqpPlsBzpjyq79LkXSa+wMuzaX4xq\/ox1zuVMZgzudE4BvlSBgAzXuM4KL4Ra7CIUbf0RJV5BtwH+2j7zt2Xh8lkP7BY1mbqnN+Vg8z8MTnwo6G\/WOo8zaz6gbA4yCvPO0xegeJZmbggQveC3YkZT9RQ45zD8StS7dkB2dcNMH9qUnA1RyTlrGyJX5G5MTSLsW8QunqikFmElWkNsgV9Ex+M+3z1TIu9f8hT9yF\/iQAIC0tNERgT5RcDtPVLiMSUl0uWZhZ56\/m+k18nN\/8oEf0FZGYBzKR8cNcvK+cM6Inu6VpEqjfpx951SXF+sSo5j80xqDZFbWycgQzBrS1f+mfsV\/S1V3RR\/aG5HVntB8NtwH0PlGIi155QE8Yu+jnUCl7yz5L9QhJN4TVqmSIxXCT3EBN3EhB6MYw4LpPPJc3yTIKK6ltDhtp3yrBWSfzgZiwZL1jLLpJ9V\/fCtdzuC33AQbxgjPIVBJ8bW2G1\/Qp8SQKGRdVX6MR8L6XK03tvYasRgnhRo4\/8RtW\/tzhUUaRPGO66sF9ztLoeMwR8blgUcLcDRTFbZKOgmyPqo+a23jCi32H8+WJsB04XyltGSkAPN1jZJsdQ+2FCG2pW34KkPxUvl5+pULXaLOs1twsR\/K7iCbs3lOLvA4bDoZ+5EyvFcJDhmguP2s3Su64mXdfcQqh68UegDdyTutOt9TjLQhGfby8URyLVilFs8gUoCLr5E7tHlSg9GZthTWew0+jOmr06HWytD5Eu9N\/aUPcxadeM6js9XSH5OC4VUv+qZeUtfsmfGyYd8kIU5e4wz4lQZj4kbbZGsYzFlQI2OT4yTEsfwcee10FafOiCM86yfPnPKPQEnLxUV6PNx\/MmIq2UgGHT8xn9IttwwUa4KJZ9dgeB6iVk0MexzLaOHEa\/wK5dkQxvKxKe+sbdHIFbsLm3eOU5o3ourPIRYd0HTVcAjuOcnHdS6CiGgga4PqH0wJ7ZQ6R1cbCsMagW2FpivyBbJ2Y8hwrQyYCKmcR9cGEom1UTHSHPbUXw6Mmz3j85f5eQGzfDH6HW1YuGcKtgvjUoiW96PFInZxymg5opWnnvpH9+p9XLhObxOmDDhKGnz\/VfflvjqepvA7d6tNRg34uQF2bxykvfb8\/a9TGNVckLfcV02W6R4p+pLK2nVyewds9LBhNAl+PpW0dVFwKo4spn4Nwop1A657NL31ojNCnB3JowTD5g4sqSI4oc43EZgLspi\/\/Pw2meHlLhrhwGICJgyeoTISnw16agdrVnqFsuAYuHM5NlYy8+2UlwOGatGBumbgmbHq7z4VmRbmaGWXPirKO6P4sHaMq9Antqw2T3xjgFEVxFCWnY\/BsAQUE+pNzNCCAKoVlBk3S1CYgpB2ZyQYXOv98Y7MwSrsObem7p1Rdd7elvjE8CkGd3UfUFkbXoV8e+hwUUDk325ND68jzsfP4m1iQIH4B92Gces04oNT3T\/RcS3HJxs6\/\/2\/wUPOpRELys9YNqbOGB3FSse66nJheYqGTEaVacu9zEy5Ye9b8dUE5axbXvbtS+vlKCMrjlW7hBeO5tOGtvZf1BM0hbK\/unpW9MCk\/7YVoQckHuA0mq9z0FgTfdlMZ376OYI8ZWQPyiYxcw0AfiDKMGt0qe+Mcjgwcpj6ilM\/YvJSaD6zq1siuVwSDU7Ep1JBC\/rBw+OsIfgELsKU\/zpbhl6tEau3qiTetl\/XvU\/wz5derqzAZDimPVN0BSWl7foP4V17VFjENz\/BfEf28sQYuh59Y2OvMCcSu5MHyxY6frVUPshPGoo7zv809I47uXedbTVBd5Z9Zg\/GGhpc7TDasWUYPLF6ErHIGC+OQN3Thx2P7sv3SLFbh4+yIutB4EPOo8anw7wIJv+1veWGgYGSCb9E51ZXv6IxW5i2JbJil98vnTpHH+b0miCbUFNlZ8eu+MopZosaZ8CFJkLUSDhAT4Adc1TIuzj\/8FhnH\/z5n98ClyWjbnYDH7yFluUDsA9\/\/jZXbHaZKzN5dDr2AQzKArnGz\/JGASBfbNBwfQ5Y2X00tS+9VoBBFqV8gi0L4QqYiYRkxTiL4fRrbKdMohdCmZ\/R\/DRJJs1nHIT\/J2zpAaNTTuEwwCuBj2lPfPiMOpkPY2WeZELY51x7tvhTZD6tXA+K1VBldeWMcUddxg\/KdWlV5vryvR3fh8nhkTjn3S5Wnto0v9jTItxpQfAzytOurNdGa4sMJIWpcLZ\/e15KQXTnDTOb+6gwaUCDYM9CfbK+RJsdBowUNGTmLRcWh\/I45SMPMrrjAvCekM1yTfDhwmIT\/rZMKCkZOlM2hKtFnzttrVTRE8Nh+AgXc3nVeflnAoXK+5b0aKDRgppFPdmZcxvuy0TZgMDS+zptdPOysrQ6L1jTmMoTfjm4BZOYIEvrEV70aqlHfaET8wVGEFeeOxyewYt\/n3l55VhUo155bc3zYUJdJOTLsLD\/0NxaQEgLUyKUsXNFwETQPJU60WtxpvvM05x\/S09qfPCHtgcwLI+cP77D3L46QT8kZlkGesXzb96wHPf2717+yZxqdI\/tWfgq\/MMF\/lqGTRPzsvLY\/3dglqN\/\/hAJtZ\/RS1JFI7Yw0QUb2Dj3cwWkMnXjN7w3YC\/qi7G+tr+knsSE7zgBa5ooRFIQMDl8xj4uOR2VT\/aXvrBmblqmjJv1H5CxCG5XyxBkTPr9Ju\/8QMABS1in24HUrB9v2VP2jjv1l16aGJZpwSwlJtuY4eT06X3od6k5ZBY\/sPoHj\/9tkdqw9UgNO8IWXRIH9lXuplAVtE9R5BRLMcD9xFrWweXK+YW4Vlxqncbtg3IQvLhvdaCUqG6qfR8ml9bCqVqU4PXLXaVBOYU0BUjZV4UqkRPn3JA8RzlxAebthnPEnhb8xevhUAHcZSkNrZoICPL06hXn7KUBCnQMuOLYoPe2tbd+Mz8j8F5KMmAa8m2IRLeFeIU51U25Uq6f6ON1N+GuXjjvXGG8UD+OC8o1HjzH+cWDFTppxu7twZoLYoY3qPYClI1FCHIdWat1juaFjdfXxaCW8z26Vnv\/+lPwfdb6XXw3VIlhi5PCltTOPyJ\/LaaWAeQ9lkb7qoQB3dOgnRwF+IP7VztnsT4cyJlbld5qWfY3XUvKQEO0jg5f93MM6MCnso9SdC5mBkWY6UuULZYxSTgYDX\/uCm0iuV4l8Z+amKspLYWvbCq8IFIjTZ+95bDNroQJkNgYpZBj0cl3GyMCW6cmcSf2SmhnchKqdHfQrZ4kQoafr5ACkPrx0tLbjgCh1c6fGZ1aRUd+nWFNz2P7xVS8G8RvTV3xdulk+3KfdqZzpiY6b0LiKT0yjyWC++X64hHeh3S9M72k6rQmzwc+4P97jVPYUVt0K2EdjM9+0eRxeQoB4EFiit3+vB7Chpj91oqs\/pz2DMQOSEpuIzIgBLDOnqYYQFEW0s\/9OBnx6j0IwH9dmU3DOGjBRrU8T35rft+15W7M5RdC3rr2Z66MqNnrHDzhAnxJuZDOXA7BYMpkq0nlNxpc2pRnZEPUkjzDfpwVmv7foMLSAGeYoQdlrhrbSa0A7skF6FGMUDT7baYoJucTE+EoPUELFE86ZxxoLCSg2PTtCI25AeABjYm7TaapbicxTQb9GtvCy7mBzOo1C5rtDq\/5CiwxZDcCuVfGvaJT7nOJvXvD42m0F7rQNPh+DJhxfCs+rfW6wmxqW8kz57ssiSfQ5lJwMbCBMRjYu5fDtl8uLN0HrnEz6XGS83GnGqK9Q+flGyQhpZ5aBuSrOxjuO43BDpXKrB+dbgUJp3jZIK41fFTZr8YcGiBeGq9f+zE\/oeAfcvH0twRQzO5vsZUqp\/OK4dClEpsPsQmR8bUqbdrj2ETGoH2Ih2i8ijBhGyc+7uMOox6XgySFvy8sVaMfryINUgt6OCSH4Xu7RQwkDbYDzNbw1KS3fXJ5TWyOaIZJTUlVJ\/UWQLjGvxNrVlmZPmJMJ\/lUaansai1BlLViY0gmfqavLDAU2qpudgW7C1Ncm\/3gP6\/DZiWDq+P0RCZ2xcAm9GjC8PvZGLtQSCrxEzalQWPrMVe+zwlPoU3lkv4lFc2SGIKlyBKZ+NjMwoDd2a7rRvsQlynPpJqQXlFy+sewQqngjbXZ0LYkKwCjEnqUb4ip8YkkIS1GAFZe5vp3aqBXEF5ID2YdYnZEJWLCNSoTGr6d9XMNLXB62sSoxgeacZtLrNuZ2mi7CrRVj7ee4mVPnN0LedBweBy6sxYdhAIcWAwYTA2htM93ppT36m8qifXcledgiqzDmlYRRIJXITMtt1xlR683RfySVnBmp\/CoaOHpjrllbU9y69yzzIwt7umhf0nMxx8tO1lngdcLWlUkLK5rkDeDby2mvFOHs9awTPFdgVjdwGKtBUvlt64\/JOrbKeNu3Lv2a84RccV\/IbKkqjhTKulbHuqM7Kgq3Ju7deH7Xe91kZFf5JUo050s9z3hMqgbjeDRGjGy6kF7eKv900ejtGuibx7kqFIOBrinc6QrrsG1bPKulSAiJe34cmM19sXfNmo0WMBMaVvJ6xgu9FRwJXoZ1jSRCfWLF79dC2Oin0Zn9TTMeGKz9+sogAiEUIw=="
+    "db": "Ejfokh6cZBFh8k0n+fq3ioUJzvvjtAqaJVuWBWgvKNlk\/ffNW8B9B8EwCVP\/wX87vCyiE4onbdw7RHyKUiMtmqMjTTAXr2fnwx\/oAgg4F1AthXt0rZDW6xX3PNBwQNHFZ1rFdWT8J90xd719qLY0+UWdyp2XaAXTdvY9yXUilH\/tG5PbNfP4x6vHeqzFrpfw98cS1k+dwRLU5iHF8O\/HHpv+ldwsTgT3ij4ARvmcvW9rFR9qtVspUDnqvO5U9\/lGv7exNjF7KtD72yi\/II\/i7VhdGN26LMzzqEFqhlkhpG2jBmRN+1bqL1lTMA4qjZNGaVlMpC7Ufy\/n8hTBhQrO1uEVb1lB4kCuFnsGWWd4cI9As3iSBmGq+bXsQe67RgDLSwdtdKmOrFTsYyBN8ywSVEFdd4CZcVfWREeY9LoRYJj2UgccrgHtp7zPHg9hkJN7uMB6Es75S1NCgdybkLbuTmyT78c+mXL9XNlz9bkDY5vcbqebmC6zJNqDbFH7u84+2BkZv\/3fOX9YlM\/S6iPRodhwMxwLKc6WY24XRwrR9bXUxAiY5pOInSR6Z9r4MLatubBP2m1WkED9cLlMH0oDYi7JnjtoS7SFnZJOKD2YBPUTT1boyp\/hDraethiEgJc9RGzNcUVu8cfmQdJBXwZ18DxHaxApAmjUm8fPLFpudfOOfyykrFBCJZ+ep6aeIfmAyG71DG+PSLkJeSd82vLiVHUB3GrNg+VuJxsDP4bfybGMXgflGqJnx4ht9gr8\/R7nvS4AHQas5eKO7HfpcuqGT\/AgpT570GAmyCFsQbbYlS0qHE\/IYZdB6vM5f2ItkvDsXzxVupU8XMlfmFOx+AMeADZGyIaeBxJac3tsda4J8JgA0gba39xtSBeonjgPCjElOlpfY\/KBU5OKMteoNkKZPvBT73MCZwmD7PwCtBLDWCfvvnRFnciuA79MwbSIgvDhLGk652shMvac5g\/L69BkXiBQ5IT4+0AiKsMvJ77CxAkR4CkDaU3tRZYLKDAqllsuY6Ds+yvNE1p+7RXgQC37swa1ogYq0dE0GjJeZJMxtaDyMamdvfbuQ9Pc9EH37j1vbyfJ4Ty9U5nSi8zZAhlLbu71VecagZG1Ti0wrxnaMwk1AjLC\/Viw0qBY+IKQ2zRO0K0KsflMqLrylwbzzwkr0VJBzaVDwQi2UtlPdGpNJVrcPyDyeNrFthg+cazfaCgWFezt8cRscckU7cZ2i5ZlqUd44Vb+253Fi38UDz0bDyUm4pytIIH2Nm8bmTtnGdyvDeKtErLGsnxKVRgYGm3rQq4WLyJrYsFNdiZriEY\/E206fFW30jG30hWrK+nSgsl96oa9k2W7bX+QmCnrCQ8oULGEE7GCRbhNzXhoTX1MMe1R7k2q\/8S4u5VrE2Uhr3\/UAh5qR\/2BWuSRTWoONP0xO5q9YazRgYcQmrx\/p0LzWuf2TPjyEGpfQrJhBVQpuywlN5i3na+E6q\/gfJbOWC8K16GP\/2orZ2s\/cMVY8XFWtOaPog8x3Sb5eYIEMp8KBmyFYkzjfF7nMlfztcP49sYgyvNI+fUk1x4iL6ZNMLtvjtNxBIPPqt334o0RHF\/8XMd0vu7OKYG3fS84zdI9jsDCSphmp\/XPFXXd2UDNA9NLsFWhiQy8JpMY3MDEjh1MDCB9Q5Gsy8xGIPeef5NSnPtTxgTjYjwC1wYUFOahECnrgrhCiqKL6ktp2Z8OkmFWyYmUBgpkOBb3EgyUxgn2MmJsEVKYNkFwFpenMVb\/R+VZu0CCgTtD5Dk8zohJGbwa+ZbEAq\/peBTvf8hwU+CgeeUntxsi4JcEdKcn4Av7nyVPwuiK0KFdcYVDYkUTQc+\/49wrWvbBCNVFzOVTu6MK67fhUNcU3vA1PPwmYLhRGU3nXqDVSe7e445m5ONg\/UfoX94Ke75NLReuiwWEAUhPgBJO+mM6OTUfJNVMMZliY0Lx5mv7GTCSiiiekw8bhys2gBXjZCM7+KDL15JlmnxsftrEtinJc54GmYijdVUhM10YlQLmLvngpXUDm6ltbzBwvUBM6DJNM6OZR1KAs4SOiSKI80jVp3PLiXXz\/ebk\/tBUMtg1GG044Wn136elDK70LIVJ+NKfA69ry62YeZw9waBIxV7qWkysG8AJNO5hyCZFhobW0PKS1V2Nz+mmtRddaadsv8+zAJPZep\/j37+DetN65oHW2ncsGA\/zJl6HJ3ITiFl2WuiPEBU69O3JYvFgjshmqBixaGE5TOO+6M5TU7tRE\/8KFCwxoO05tJqD\/JHk3KEorL8HfBZ6K1yvGkyRVS6MFBC7sAfEk6WvRgzd4paShGzBmL9iIs4kx2emoZMyQj1i4WFtzq7m97+Lkfwvz05uOCdYICYY+ahEURLUS05e92CvakAeQZJ7Sff5g4k2v\/H6TOdRPSxCdBIf494L0fXX+u9J+lXgtepPIb0xiq6pfWNLr\/UP0HGWgPHJ+lWVxVOXUh0y9To+u\/HaH0frnnKkp58QQKqd1hMPubuU1z1AkE1oVfJmhLApFW78wqiwzM80o4gDKwjq3QW8ymy29bG+ubLeb\/LLTtm+qO1gFnP1awH21dFnaR5S8a3vWlqQLcFI2Ir2ZffryQq+DkbOX849QoHh\/MclmQs2z3y+q\/IKwBoCy8ft\/AXvOHycoIFym5k+6s7yhd3YI8l8C+hqBMgPfj2o6ESZuuYCI+FemWAlvz6CHyfvFujT8pLjEHjZU5lSgIfPmV4se125lutxhh\/o9RhL0VT2aa7rgxr2Qwdq5fuLWpiedRrysCOKzetnGKhUZWnJe\/94WAwdDyLa961uFZzRIU\/KfDSkQ3AkXEjXOiDnIxhFNupS1O9rt9U3BcrLH\/WqzkvXZZxt5mgtumTgQTaWwGczcwPrcACTuJZjrgJXnf+woTedpSxWZMh10b7vVG+\/F\/X\/6kuu3ZEP45kMy4jCmU5ILOyf8F8r3B5w0nfW\/aBRPOWujVMMg7CbOP\/CxM2qV0Q9eNic\/b24CT8Bf6QLOy0NR1hKnPc4VKNZelHvKzqyJwqjMPYL0wBYPgRy9GbYl\/lYnfqoFUXi5K8b93d1gHx83aPvQ4zJi0GkzsPUp\/lNpDEJrsPm7+x3M1maG8sd3O\/tq64b24PnmRz2MdNzaXsU1s5ByPAYv04UVVrkUJTqu\/DgSnAGfGQpZGl10qcFkyKW6Z23PFthp1SKMvBZYNqWyp\/RoMMM6u3B6Hm4dyV1yV5sqpnOSt\/LkQhCGl++XXI6yZcHUZLB7jAqWsT6lweNCX9KB47xna+7xQflRAFerWtlzBxV1Ks9CIsDvJpCuRT+3zwFnz15taytNXavSyJtKMGWgS6pXmtXI+ks4NA5PGxmrYwgW2Z7s5qu9aBZE6pdkSXKkAKpNfYgmbwYFwO\/76smjiZ1+Bt68eAX1jnu7AjXDDhaD2nH3jp2EU1CIxh3BTEQV5GE6\/aj4S3edN53Ncq\/evjmLcAK9AhjARlDRl5SWkGSXJTUeuiwpcYOGeBJY07oEGcEZeEF+Z4QTJLTugURp4aVzhWPeKDa4fkBwvjtPtpyIWVueCX1zlD3N9a+KsCapMFPVEWeLkib3Fl0oFXAt1As\/fQRbsTI35xDjO1qIxqaLdy9LMKQyzqZB6hSrPrWaXzVfS\/\/JEETpg\/tH9pfUZGEk02Yf89ngOFlNUyThzVZN5cR6kvtVc5cPCpwqEJV+jiKEkawmxuBnjsdz47IMwAvnn8DCmY2dzHzBuXbsesCZtuDmKa\/cOZJ46n8IJ9ks0EqsWn74q5Tkd0eO5945ilmh0BbIj6To00SfoZpDiif5joLoh54NePmn7PF\/mAnv9T6rLhY4\/JYmgL3IqrI\/HdAuJkBbA7kcVrigMFpp20Zts38YDZXNvMwW\/8zGge744o55w7tiwmcQJYdgc8Vpw0POnmAXae91lznpbk73uLdhfEffizs9ngZZY00ykOtFV1Tsbs2ypcTVpmImLfXDuQCiKyB1FHLTSZOSBfwE6yqM+z9qpaUZ72bF2O9zlDMyxLnB0\/y+I2rrjfEb\/pva9GocgF6WlzUO0h8NQ6CpDQWT1V6CkFRZCDclUtufK4uOkiU9BCtHW\/IofTWjqXLj8WD1Iuoorv6ffk7dwgffRnzD\/6K\/obrd1IgIYfWETeQ\/U\/gAMlRIPFdftsus31SaXTkMwR7VZPV1EmCwKLXCqcbAF6frDjcJxYFSrVszSwBze40BGsb5tVnWsHf9kw4dfReMNvDQSTPlNFN5iDO9icc0UN3V3mD7AZw6yvmKdEZfRRcHDbN1ch1+7TscaotKeOg7alBMb4E9GFLXNRBu1eJdJ+yPE08SWdFj3rkea501yMGD96hnwYKx3ZpFyuTasLkrQebBDNTNyB9WLKazdqmw3sDlipWSs6sBnazPDkaTi9m6\/BWc4KqZcRiWhY3dhzfa6hWXI76JajH4MFtPlPqwSrar95WNZFUcjMVMM8+d+34gDEy2djjzH0Er9vIjBYgwEknBQr8ASDMP59LXgrelVDAKlbm+rEHqumqSCChSTF6g2ZihiajYlg+sMbdkaFZNRI+4VQR5H9ufFMwqCpDAePW5RHDw8FcVnp6DvpY4CjBm4D5Yx5rwiRc0wJE31ZaSciVKhnK+1StvjMoFn9yxf\/2SdZG4SzdYjqs6oIxUKUiVSj+x3rfILGKbAf8wDoqmmXj1HEm3HQY501h8roOyrwrH9Ql0glfRffjymqwGQpEeLhKO6ldTH6VP6ds8dsnM1oUFLBnRLM8Bpq5XqSSAcfj+eMd0wt1MGDdXRMWJzVcQBpuptPle\/kt\/INmBid\/zrANw+ChhJgAznOekdL5YKWDHcrgI9R6aF20YczckBK+WSpx4OJ1Z0eozNWM7IcG\/KAqwm3+c\/iPDL3cMpCTQnhLM9bSMakMYpDVKTwyY1TsyXEX4ZCc9ZAdZQ53b0yxGBkX+lM\/HeHw8nOeu9qN8JtgAi00iHolNEyiohZupxeXYKoc3WpJ\/HgerkxWTT1VhuwtRuy8EzG888il93HtehFPUbyZKW5Q6Fys5q\/Q4sfOr+Wc4aztSf5JW\/ESa3xRi7x1gLuwADIUfaFZCG0wPL9I7sN8Vqe4qrehP+bVBOqx3UOXXxOIMi80NV\/9EEZiPpHOu+Qb\/k\/EBOCYAWaBxeWujR7ps7A3iUpZf1W6Y6jtXH3T\/pzPH27ikd+yM2aR1ofhBbawUfkKE5T5vju8S8t61QKVfAp3UxJFEvCpROcbsWthd40v5mr4e2VMy2wgLcpVsR4mT93Dlg=="
 }
\ No newline at end of file
diff --git a/testdata/aegis_export_plain.json b/testdata/aegis_export_plain.json
index a3ab399d..10d03a95 100644
--- a/testdata/aegis_export_plain.json
+++ b/testdata/aegis_export_plain.json
@@ -12,6 +12,7 @@
                 "uuid": "8e986927-a7a3-4d35-88fb-509ae7960155",
                 "name": "Bob",
                 "issuer": "Google",
+                "icon": null,
                 "info": {
                     "secret": "KD3WHMYQ7K7DGV5QFJNN2ZUATBC44C7F",
                     "algo": "SHA1",
@@ -24,6 +25,7 @@
                 "uuid": "97155de0-fb6a-4dfa-ac59-2abe54f5d059",
                 "name": "Henk",
                 "issuer": "Scaleway",
+                "icon": null,
                 "info": {
                     "secret": "MBQX47S3XOSOF7YT2CO3LZNACULZNY4P",
                     "algo": "SHA256",
@@ -36,6 +38,7 @@
                 "uuid": "a6276843-3c95-43b7-a3ef-e824c5534801",
                 "name": "nodejsc0d3r",
                 "issuer": "Github",
+                "icon": null,
                 "info": {
                     "secret": "642GK5EROWKUAEBFRH6FWSMM4FRKS5IA",
                     "algo": "SHA1",
@@ -48,11 +51,12 @@
                 "uuid": "1748b48c-7496-4722-9048-17248e843773",
                 "name": "Lil' Droplet",
                 "issuer": "DigitalOcean",
+                "icon": null,
                 "info": {
                     "secret": "6CAIGVYB5MQ6TSZLJ56HJBWU5S3H7FUC",
                     "algo": "SHA512",
                     "digits": 6,
-                    "counter": 96
+                    "counter": 102
                 }
             },
             {
@@ -60,6 +64,7 @@
                 "uuid": "9eef3fa3-bdde-4954-bf37-58bf1d5d6e5f",
                 "name": "alex",
                 "issuer": "TTRSS",
+                "icon": null,
                 "info": {
                     "secret": "BEBXDJJVXKX3ZMAZLJUU5I5PONI4IYAL",
                     "algo": "SHA1",
@@ -72,6 +77,7 @@
                 "uuid": "159b3e5f-fff4-4ff5-997a-b8d1263ee446",
                 "name": "MoneroMan",
                 "issuer": "Poloniex",
+                "icon": null,
                 "info": {
                     "secret": "NUSLOF6CFEWNPAARBVJ5WFA5YRRQU4FG",
                     "algo": "SHA256",
@@ -84,6 +90,7 @@
                 "uuid": "8cd843e5-4122-48e1-8089-a3d0c769741f",
                 "name": "givemeabucket",
                 "issuer": "Bitbucket",
+                "icon": null,
                 "info": {
                     "secret": "5KY3D2N53MRMIOMNKLLTNF3TDQJRDMEY",
                     "algo": "SHA1",
@@ -96,6 +103,7 @@
                 "uuid": "77c6267a-b38a-40b9-a3a7-5a5ce11230bb",
                 "name": "Pepe",
                 "issuer": "4chan",
+                "icon": null,
                 "info": {
                     "secret": "EIQMT7NHFYJUMBKQ35P34JGLG3MO7L2W",
                     "algo": "SHA1",
@@ -108,6 +116,7 @@
                 "uuid": "435a3542-c566-4cc0-a5f4-39cd6ffe316d",
                 "name": "Delete Me",
                 "issuer": "Facebook",
+                "icon": null,
                 "info": {
                     "secret": "GSQ7E5FO3UFFVANS3NSMFE7RTMRMYNCV",
                     "algo": "SHA1",
@@ -120,6 +129,7 @@
                 "uuid": "7dca76af-fa6a-4585-8d47-5a8b78130c9c",
                 "name": "Oh wait, they don't have TOTP",
                 "issuer": "Namecheap",
+                "icon": null,
                 "info": {
                     "secret": "HIMV4HX3REXMUG236OOLN4GS7URI247Y",
                     "algo": "SHA512",