diff --git a/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/Aac.cs b/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/Aac.cs
index 30dfaa8..08ec533 100644
--- a/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/Aac.cs
+++ b/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/Aac.cs
@@ -58,6 +58,13 @@ namespace AnimatorAsCode.V1
             if (container != null && EditorUtility.IsPersistent(container)) return container;
             return null;
         }
+
+        internal Object GetAssetContainer()
+        {
+            var container = AssetContainer != null ? AssetContainer : GenericAssetContainer;
+            if (container != null) return container;
+            return null;
+        }
     }
 
     public class AacFlLayer
diff --git a/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/AacInternals.cs b/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/AacInternals.cs
index e461c92..28ebc1d 100644
--- a/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/AacInternals.cs
+++ b/Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/AacInternals.cs
@@ -29,7 +29,7 @@ namespace AnimatorAsCode.V1
         {
             clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             clip.hideFlags = HideFlags.None;
-            if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetPersistentAssetContainer());
+            if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetAssetContainer());
             return clip;
         }
 
@@ -38,7 +38,7 @@ namespace AnimatorAsCode.V1
             var clip = new BlendTree();
             clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             clip.hideFlags = HideFlags.None;
-            if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetPersistentAssetContainer());
+            if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetAssetContainer());
             return clip;
         }
 
@@ -47,7 +47,7 @@ namespace AnimatorAsCode.V1
             var duplicated = (T)Object.Instantiate(assetToDuplicate);
             duplicated.name = "zAutogenerated__" + component.AssetKey + "__" + assetToDuplicate.name + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             duplicated.hideFlags = HideFlags.None;
-            if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(duplicated, component.GetPersistentAssetContainer());
+            if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(duplicated, component.GetAssetContainer());
             return duplicated;
         }
         
@@ -56,7 +56,7 @@ namespace AnimatorAsCode.V1
             var avatarMask = new AvatarMask();
             avatarMask.name = "zAutogenerated__" + component.AssetKey + "_" + fullLayerName + "__AvatarMask";
             avatarMask.hideFlags = HideFlags.None;
-            if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(avatarMask, component.GetPersistentAssetContainer());
+            if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(avatarMask, component.GetAssetContainer());
             return avatarMask;
         }