diff --git a/pype/plugins/global/publish/collect_avalon_entities.py b/pype/plugins/global/publish/collect_avalon_entities.py
index 103f5abd1a..53f11aa693 100644
--- a/pype/plugins/global/publish/collect_avalon_entities.py
+++ b/pype/plugins/global/publish/collect_avalon_entities.py
@@ -15,7 +15,7 @@ import pyblish.api
 class CollectAvalonEntities(pyblish.api.ContextPlugin):
     """Collect Anatomy into Context"""
 
-    order = pyblish.api.CollectorOrder
+    order = pyblish.api.CollectorOrder - 0.02
     label = "Collect Avalon Entities"
 
     def process(self, context):
@@ -47,7 +47,16 @@ class CollectAvalonEntities(pyblish.api.ContextPlugin):
         context.data["assetEntity"] = asset_entity
 
         data = asset_entity['data']
+
+        context.data["frameStart"] = data.get("frameStart")
+        context.data["frameEnd"] = data.get("frameEnd")
+
         handles = int(data.get("handles") or 0)
         context.data["handles"] = handles
         context.data["handleStart"] = int(data.get("handleStart", handles))
         context.data["handleEnd"] = int(data.get("handleEnd", handles))
+
+        frame_start_h = data.get("frameStart") - context.data["handleStart"]
+        frame_end_h = data.get("frameEnd") + context.data["handleEnd"]
+        context.data["frameStartHandle"] = frame_start_h
+        context.data["frameEndHandle"] = frame_end_h
diff --git a/pype/plugins/global/publish/collect_rendered_files.py b/pype/plugins/global/publish/collect_rendered_files.py
index 552fd49f6d..8ecf7ba156 100644
--- a/pype/plugins/global/publish/collect_rendered_files.py
+++ b/pype/plugins/global/publish/collect_rendered_files.py
@@ -13,7 +13,7 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
     `PYPE_PUBLISH_DATA`. Those files _MUST_ share same context.
 
     """
-    order = pyblish.api.CollectorOrder - 0.0001
+    order = pyblish.api.CollectorOrder - 0.1
     targets = ["filesequence"]
     label = "Collect rendered frames"
 
diff --git a/pype/plugins/maya/publish/collect_scene.py b/pype/plugins/maya/publish/collect_scene.py
index 089019f2d3..e6976356e8 100644
--- a/pype/plugins/maya/publish/collect_scene.py
+++ b/pype/plugins/maya/publish/collect_scene.py
@@ -9,13 +9,14 @@ from pype.maya import lib
 class CollectMayaScene(pyblish.api.ContextPlugin):
     """Inject the current working file into context"""
 
-    order = pyblish.api.CollectorOrder - 0.1
+    order = pyblish.api.CollectorOrder - 0.01
     label = "Maya Workfile"
     hosts = ['maya']
 
     def process(self, context):
         """Inject the current working file"""
-        current_file = context.data['currentFile']
+        current_file = cmds.file(query=True, sceneName=True)
+        context.data['currentFile'] = current_file
 
         folder, file = os.path.split(current_file)
         filename, ext = os.path.splitext(file)
@@ -24,9 +25,6 @@ class CollectMayaScene(pyblish.api.ContextPlugin):
 
         data = {}
 
-        for key, value in lib.collect_animation_data().items():
-            data[key] = value
-
         # create instance
         instance = context.create_instance(name=filename)
         subset = 'workfile' + task.capitalize()
@@ -38,7 +36,11 @@ class CollectMayaScene(pyblish.api.ContextPlugin):
             "publish": True,
             "family": 'workfile',
             "families": ['workfile'],
-            "setMembers": [current_file]
+            "setMembers": [current_file],
+            "frameStart": context.data['frameStart'],
+            "frameEnd": context.data['frameEnd'],
+            "handleStart": context.data['handleStart'],
+            "handleEnd": context.data['handleEnd']
         })
 
         data['representations'] = [{