diff --git a/App-debug.html b/App-debug.html
new file mode 100644
index 0000000..60d91ee
--- /dev/null
+++ b/App-debug.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>portfolio-item-copy</title>
+
+
+    <script type="text/javascript" src="https://rally1.rallydev.com/apps/2.1/sdk-debug.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/async/1.22/async.min.js"></script>
+
+    <script type="text/javascript">
+        Rally.loadScripts(
+                [
+                      "App.js",
+                      "utility.js",
+                ],
+        function() {
+            Rally.launchApp('CustomApp', {
+                name:"portfolio-item-copy",
+                parentRepos:"",
+                version:"1.0.1"
+            });
+        }, true);
+    </script>
+
+
+    <link rel="stylesheet" type="text/css" href="app.css"/>
+</head>
+<body>
+</body>
+</html>
diff --git a/App.js b/App.js
index bc68ffa..e0e7ab6 100644
--- a/App.js
+++ b/App.js
@@ -121,13 +121,19 @@ Ext.define('CustomApp', {
     // displays a chooser to select the portfolio item
     chooseItem : function() {
 
-        Ext.create('Rally.ui.dialog.ChooserDialog', {
+        Ext.create('Rally.ui.dialog.ArtifactChooserDialog', {
             artifactTypes: ['PortfolioItem'],
             autoShow: true,
             
+            //override to allow pi's in projects with only
+            //read access
+            _isArtifactEditable: function(record) {
+              return true;
+            },
+            
             title: 'Choose Item',
             listeners: {
-                artifactChosen: function(selectedRecord){
+                artifactChosen: function(dialog, selectedRecord){
                     this.down("#item-label").setText(selectedRecord.get('Name'));
                     this.down("#copy-button").setDisabled(true);
                     app.itemSelected(selectedRecord);
@@ -233,10 +239,16 @@ Ext.define('CustomApp', {
 
         Ext.Array.each( this.fieldsToCopy[type], function(field) {
             var item_release = this._getRelease(item);
-            if ( !Ext.isEmpty(item_release) && Ext.Array.contains(reference_fields, field) ) {
-                copy[field] = { _ref: item_release._ref };
+            if (field === 'FlowState') {
+                if (Rally.util.Ref.getRelativeUri(item.get('Project')) === app.projectRef) {
+                    copy[field] = Rally.util.Ref.getRelativeUri(item.get('FlowState'));
+                }
             } else {
-                copy[field] = item.get(field);
+                if ( !Ext.isEmpty(item_release) && Ext.Array.contains(reference_fields, field) ) {
+                    copy[field] = { _ref: item_release._ref };
+                } else {
+                    copy[field] = item.get(field);
+                }
             }
         }, this);
 
@@ -374,6 +386,10 @@ Ext.define('CustomApp', {
     
         Ext.create('Rally.data.WsapiDataStore', {
             autoLoad : true,
+            context: {
+                project: null,
+                workspace: app.getContext().getWorkspaceRef()
+            },
             limit : "Infinity",
             model : config.model,
             fetch : config.fetch,
diff --git a/config.json b/config.json
index 7e697a6..45db783 100644
--- a/config.json
+++ b/config.json
@@ -2,7 +2,7 @@
    "name": "portfolio-item-copy",
    "className": "CustomApp",
    "server": "https://rally1.rallydev.com",
-   "sdk": "2.0",
+   "sdk": "2.1",
    "javascript": [
       "App.js",
       "utility.js",
diff --git a/deploy/App-external.html b/deploy/App-external.html
new file mode 100644
index 0000000..2bf95ec
--- /dev/null
+++ b/deploy/App-external.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>portfolio-item-copy</title>
+
+    <script type="text/javascript" src="https://rally1.rallydev.com/apps/2.1/sdk.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/async/1.22/async.min.js"></script>
+
+    <script type="text/javascript">
+        Rally.onReady(function () {
+                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"]}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,Ext.apply(app.fieldsToCopy,e),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("Created "+r.get("FormattedID")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){e.reference.getCollection(e.type,{fetch:!0}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(e,r){var a=r[0][0];app.list.push(a);var i=null;if(app.defined(a.get("Tasks"))?i="Tasks":app.defined(a.get("Children"))?i="Children":app.defined(a.get("UserStories"))&&(i="UserStories"),app.isObject(i)){var o={reference:a,type:i};async.map([o],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,a)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem/Feature"],margin:"10px 0 10px 0",fieldLabel:"Feature Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
+                function getReleaseTimeBox(t){var e=t.getContext().getTimeboxScope(),n=null;e?n=e.getRecord().get("Name"):n="";return n}function wsapiQuery(t,e){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",context:{project:null,workspace:Rally.environment.getContext().getWorkspaceRef()},model:t.model,fetch:t.fetch,filters:t.filters,listeners:{scope:this,load:function(t,n){e(null,n)}}})}function snapshotQuery(t,e){var n={find:t.find,fetch:t.fetch,hydrate:t.hydrate,autoLoad:!0,pageSize:1e4,limit:"Infinity",listeners:{scope:this,load:function(t,n,o){console.log("snapshots:",n.length),e(null,n)}}};Ext.create("Rally.data.lookback.SnapshotStore",n)}function pointsUnitType(t){return"Points"==t}
+
+            Rally.launchApp('CustomApp', {
+                name:"portfolio-item-copy",
+                parentRepos:"",
+                version:"1.0.1"
+            });
+
+        });
+    </script>
+
+
+    <style type="text/css">
+        
+    </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/deploy/App-uncompressed.html b/deploy/App-uncompressed.html
index a1d6152..787b342 100644
--- a/deploy/App-uncompressed.html
+++ b/deploy/App-uncompressed.html
@@ -3,7 +3,7 @@
 <head>
     <title>portfolio-item-copy</title>
 
-    <script type="text/javascript" src="/apps/2.0/sdk.js"></script>
+    <script type="text/javascript" src="/apps/2.1/sdk.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/async/1.22/async.min.js"></script>
 
     <script type="text/javascript">
@@ -131,13 +131,19 @@
     // displays a chooser to select the portfolio item
     chooseItem : function() {
 
-        Ext.create('Rally.ui.dialog.ChooserDialog', {
+        Ext.create('Rally.ui.dialog.ArtifactChooserDialog', {
             artifactTypes: ['PortfolioItem'],
             autoShow: true,
             
+            //override to allow pi's in projects with only
+            //read access
+            _isArtifactEditable: function(record) {
+              return true;
+            },
+            
             title: 'Choose Item',
             listeners: {
-                artifactChosen: function(selectedRecord){
+                artifactChosen: function(dialog, selectedRecord){
                     this.down("#item-label").setText(selectedRecord.get('Name'));
                     this.down("#copy-button").setDisabled(true);
                     app.itemSelected(selectedRecord);
@@ -243,10 +249,16 @@
 
         Ext.Array.each( this.fieldsToCopy[type], function(field) {
             var item_release = this._getRelease(item);
-            if ( !Ext.isEmpty(item_release) && Ext.Array.contains(reference_fields, field) ) {
-                copy[field] = { _ref: item_release._ref };
+            if (field === 'FlowState') {
+                if (Rally.util.Ref.getRelativeUri(item.get('Project')) === app.projectRef) {
+                    copy[field] = Rally.util.Ref.getRelativeUri(item.get('FlowState'));
+                }
             } else {
-                copy[field] = item.get(field);
+                if ( !Ext.isEmpty(item_release) && Ext.Array.contains(reference_fields, field) ) {
+                    copy[field] = { _ref: item_release._ref };
+                } else {
+                    copy[field] = item.get(field);
+                }
             }
         }, this);
 
@@ -384,6 +396,10 @@
     
         Ext.create('Rally.data.WsapiDataStore', {
             autoLoad : true,
+            context: {
+                project: null,
+                workspace: app.getContext().getWorkspaceRef()
+            },
             limit : "Infinity",
             model : config.model,
             fetch : config.fetch,
@@ -535,6 +551,10 @@
     Ext.create('Rally.data.WsapiDataStore', {
         autoLoad : true,
         limit : "Infinity",
+        context: {
+            project: null,
+            workspace: Rally.environment.getContext().getWorkspaceRef()
+        },
         model : config.model,
         fetch : config.fetch,
         filters : config.filters,
@@ -577,7 +597,8 @@
 
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
-	            parentRepos:""
+                parentRepos:"",
+                version:"1.0.1"
             });
 
         });
diff --git a/deploy/App.html b/deploy/App.html
index a5f6525..637f593 100644
--- a/deploy/App.html
+++ b/deploy/App.html
@@ -3,17 +3,18 @@
 <head>
     <title>portfolio-item-copy</title>
 
-    <script type="text/javascript" src="/apps/2.0/sdk.js"></script>
+    <script type="text/javascript" src="/apps/2.1/sdk.js"></script>
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/async/1.22/async.min.js"></script>
 
     <script type="text/javascript">
         Rally.onReady(function () {
-                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"]}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var fieldsToCopy={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(fieldsToCopy.portfolioitem)||Ext.isArray(fieldsToCopy.portfolioitem)||(fieldsToCopy.portfolioitem=fieldsToCopy.portfolioitem.split(",")),Ext.isEmpty(fieldsToCopy.hierarchicalrequirement)||Ext.isArray(fieldsToCopy.hierarchicalrequirement)||(fieldsToCopy.hierarchicalrequirement=fieldsToCopy.hierarchicalrequirement.split(",")),Ext.isEmpty(fieldsToCopy.task)||Ext.isArray(fieldsToCopy.task)||(fieldsToCopy.task=fieldsToCopy.task.split(",")),app.fieldsToCopy=fieldsToCopy,this._getRequiredFields().then({scope:this,success:function(requiredFields){app.requiredFields=requiredFields,Ext.apply(app.fieldsToCopy,requiredFields),Ext.Array.contains(requiredFields.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,title:"Choose Item",listeners:{artifactChosen:function(selectedRecord){this.down("#item-label").setText(selectedRecord.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(selectedRecord)},scope:this}})},itemSelected:function(root){var config={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:root.get("ObjectID")}]};async.map([config],app.wsapiQuery,function(err,results){var item=results[0][0];app.list=[],async.map([item],app.createList,function(err,results){app.models={},app.types=_.uniq(_.map(app.list,function(l){return l.get("_type")})),async.mapSeries(app.types,app.loadModel,function(err,results){_.each(app.types,function(t,i){app.models[t]=results[i]}),app.down("#summary").setText(app.list.length+" Items to be copied");var projectRef=app.down("#project-picker").getValue();null!==projectRef&&""!==projectRef&&app.down("#copy-button").setDisabled(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(err,results){null===err?app.down("#summary").setText(results.length+" Items copied to "+results[0].get("FormattedID")):app.down("#summary").setText(err,!1)})},copyItem:function(i,callback){var copy={Name:i.get("Name"),Workspace:i.get("Workspace")._ref,Description:i.get("Description"),Owner:null!==i.get("Owner")?i.get("Owner")._ref:null,DisplayColor:_.isNull(i.get("DisplayColor"))||_.isUndefined(i.get("DisplayColor"))?null:i.get("DisplayColor")};copy=app.copyTypeSpecificFields(copy,i);var parentRef=app.parentRef(i);if(null!==parentRef){var mappedRef=app.copyList[parentRef.ref];_.isUndefined(mappedRef)||(copy[parentRef.type]=mappedRef)}var model=app.models[i.get("_type")];async.map([{model:model,copy:copy,source:i}],app.createItem,function(err,results){_.isUndefined(err)||_.isNull(err)?callback(null,results[0]):callback(err,null)})},copyTypeSpecificFields:function(copy,item){var type=-1!==item.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":item.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[type],function(field){var item_release=this._getRelease(item);copy[field]=!Ext.isEmpty(item_release)&&Ext.Array.contains(reference_fields,field)?{_ref:item_release._ref}:item.get(field)},this),item.get("Tags").Count>0){var tags=_.map(item.get("Tags")._tagsNameArray,function(t){return{_ref:t._ref}});copy.Tags=tags}return copy},_getRelease:function(item){var release=item.get("Release");return Ext.isEmpty(release)&&this.down("rallyreleasecombobox")&&(release=this.down("rallyreleasecombobox").getRecord().getData()),release},createItem:function(item,callback){var rec=Ext.create(item.model,item.copy);rec.set("Project",app.projectRef),rec.save({callback:function(result,operation){if(operation.success===!0)app.copyList[item.source.get("_ref")]=result.get("_ref"),app.down("#summary").setText("Created "+result.get("FormattedID")),callback(null,result);else{console.log("Error:",operation);var message="<span class='icon-warning'> </span>Create Error when copying "+item.copy.Name;Ext.isEmpty(operation.error)||Ext.isEmpty(operation.error.errors)||(message+=":<br/>"+operation.error.errors.join("<br/>")),callback(message,null)}}})},readCollection:function(collectionConfig,callback){collectionConfig.reference.getCollection(collectionConfig.type,{fetch:!0}).load({fetch:!0,callback:function(records,operation,success){callback(null,records)}})},createList:function(root,callback){var config={model:root.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:root.get("ObjectID")}]};async.map([config],wsapiQuery,function(err,results){var obj=results[0][0];app.list.push(obj);var childRef=null;if(app.defined(obj.get("Tasks"))?childRef="Tasks":app.defined(obj.get("Children"))?childRef="Children":app.defined(obj.get("UserStories"))&&(childRef="UserStories"),app.isObject(childRef)){var config={reference:obj,type:childRef};async.map([config],app.readCollection,function(err,results){var children=results[0];async.map(children,app.createList,function(err,results){callback(null,results)})})}else callback(null,obj)})},parentRef:function(obj){return _.isObject(obj.get("Parent"))?{type:"Parent",ref:obj.get("Parent")._ref}:_.isObject(obj.get("WorkProduct"))?{type:"WorkProduct",ref:obj.get("WorkProduct")._ref}:_.isObject(obj.get("PortfolioItem"))?{type:"PortfolioItem",ref:obj.get("PortfolioItem")._ref}:null},loadModel:function(type,callback){Rally.data.ModelFactory.getModel({type:type,success:function(model){callback(null,model)}})},isObject:function(obj){return!_.isUndefined(obj)&&!_.isNull(obj)},defined:function(obj){return app.isObject(obj)&&obj.Count>0},wsapiQuery:function(config,callback){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",model:config.model,fetch:config.fetch,filters:config.filters,listeners:{scope:this,load:function(store,data){callback(null,data)}}})},_getRequiredFields:function(){var deferred=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(results){deferred.resolve({portfolioitem:results[0],hierarchicalrequirement:results[1],task:results[2]})}}),deferred.promise},_getRequiredFieldsForModel:function(model_name){var deferred=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:model_name,success:function(model){var fields=model.getFields(),required_fields=[];Ext.Array.each(fields,function(field){field.required&&!field.readOnly&&required_fields.push(field.name)}),deferred.resolve(required_fields)}}),deferred.promise},getSettingsFields:function(){return[{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem/Feature"],margin:"10px 0 10px 0",fieldLabel:"Feature Fields",_shouldShowField:function(field){var attr=field.attributeDefinition;return attr&&!attr.ReadOnly&&"COLLECTION"!==attr.AttributeType},listeners:{ready:function(picker){picker.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(field){var attr=field.attributeDefinition;return attr&&!attr.ReadOnly&&"COLLECTION"!==attr.AttributeType},listeners:{ready:function(picker){picker.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(field){var attr=field.attributeDefinition;return attr&&!attr.ReadOnly&&"COLLECTION"!==attr.AttributeType},listeners:{ready:function(picker){picker.collapse()}},readyEvent:"ready"}]},isExternal:function(){return this.getAppId()===void 0},onSettingsUpdate:function(settings){console.log("onSettingsUpdate",settings),Ext.apply(this,settings),this.launch()}});
-                function getReleaseTimeBox(app){var timeboxScope=app.getContext().getTimeboxScope(),tbName=null;if(timeboxScope){var record=timeboxScope.getRecord();tbName=record.get("Name")}else tbName="";return tbName}function wsapiQuery(config,callback){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",model:config.model,fetch:config.fetch,filters:config.filters,listeners:{scope:this,load:function(store,data){callback(null,data)}}})}function snapshotQuery(config,callback){var storeConfig={find:config.find,fetch:config.fetch,hydrate:config.hydrate,autoLoad:!0,pageSize:1e4,limit:"Infinity",listeners:{scope:this,load:function(store,snapshots,success){console.log("snapshots:",snapshots.length),callback(null,snapshots)}}},snapshotStore=Ext.create("Rally.data.lookback.SnapshotStore",storeConfig)}function pointsUnitType(type){return"Points"==type}
+                var app=null;Ext.define("CustomApp",{extend:"Rally.app.App",componentCls:"app",layout:{type:"table",columns:2},config:{defaultSettings:{portfolioitem:[""],hierarchicalrequirement:["ScheduleState","PlanEstimate"],task:["State","Estimate","TaskIndex","ToDo","Actuals"]}},items:[{xtype:"label",text:"Copy To Project:",padding:"5px"},{id:"project-picker",xtype:"rallyprojectpicker",margin:"5px",model:"Project",field:"Name"},{xtype:"rallybutton",text:"Select Portfolio Item",margin:"5px",handler:function(){app.chooseItem()}},{id:"item-label",xtype:"label",margin:5,style:"font-weight:bold;",text:""},{itemId:"release-label",xtype:"label",padding:5,text:""},{itemId:"release-chooser",xtype:"container",margin:5},{id:"copy-button",xtype:"rallybutton",text:"Copy",margin:"5px",disabled:!0,handler:function(){app.performCopy()}},{id:"summary",xtype:"label",margin:"5px",style:"font-weight:bold;",text:""}],launch:function(){app=this;var e={portfolioitem:this.getSetting("portfolioitem"),hierarchicalrequirement:this.getSetting("hierarchicalrequirement"),task:this.getSetting("task")};Ext.isEmpty(e.portfolioitem)||Ext.isArray(e.portfolioitem)||(e.portfolioitem=e.portfolioitem.split(",")),Ext.isEmpty(e.hierarchicalrequirement)||Ext.isArray(e.hierarchicalrequirement)||(e.hierarchicalrequirement=e.hierarchicalrequirement.split(",")),Ext.isEmpty(e.task)||Ext.isArray(e.task)||(e.task=e.task.split(",")),app.fieldsToCopy=e,this._getRequiredFields().then({scope:this,success:function(e){app.requiredFields=e,Ext.apply(app.fieldsToCopy,e),Ext.Array.contains(e.hierarchicalrequirement,"Release")&&(this.down("#release-label").setText("Default Release:"),this.down("#release-chooser").removeAll(),this.down("#release-chooser").add({xtype:"rallyreleasecombobox",showArrows:!1}))}})},chooseItem:function(){Ext.create("Rally.ui.dialog.ArtifactChooserDialog",{artifactTypes:["PortfolioItem"],autoShow:!0,_isArtifactEditable:function(e){return!0},title:"Choose Item",listeners:{artifactChosen:function(e,t){this.down("#item-label").setText(t.get("Name")),this.down("#copy-button").setDisabled(!0),app.itemSelected(t)},scope:this}})},itemSelected:function(e){var t={model:"PortfolioItem",fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([t],app.wsapiQuery,function(e,t){var r=t[0][0];app.list=[],async.map([r],app.createList,function(e,t){app.models={},app.types=_.uniq(_.map(app.list,function(e){return e.get("_type")})),async.mapSeries(app.types,app.loadModel,function(e,t){_.each(app.types,function(e,r){app.models[e]=t[r]}),app.down("#summary").setText(app.list.length+" Items to be copied");var r=app.down("#project-picker").getValue();null!==r&&""!==r&&app.down("#copy-button").setDisabled(!1)})})})},performCopy:function(){app.copyList={},app.projectRef=app.down("#project-picker").getValue(),async.mapSeries(app.list,app.copyItem,function(e,t){null===e?app.down("#summary").setText(t.length+" Items copied to "+t[0].get("FormattedID")):app.down("#summary").setText(e,!1)})},copyItem:function(e,t){var r={Name:e.get("Name"),Workspace:e.get("Workspace")._ref,Description:e.get("Description"),Owner:null!==e.get("Owner")?e.get("Owner")._ref:null,DisplayColor:_.isNull(e.get("DisplayColor"))||_.isUndefined(e.get("DisplayColor"))?null:e.get("DisplayColor")};r=app.copyTypeSpecificFields(r,e);var a=app.parentRef(e);if(null!==a){var i=app.copyList[a.ref];_.isUndefined(i)||(r[a.type]=i)}var o=app.models[e.get("_type")];async.map([{model:o,copy:r,source:e}],app.createItem,function(e,r){_.isUndefined(e)||_.isNull(e)?t(null,r[0]):t(e,null)})},copyTypeSpecificFields:function(e,t){var r=-1!==t.get("_type").toLowerCase().indexOf("portfolioitem")?"portfolioitem":t.get("_type");if(reference_fields=["Release","Iteration","Owner"],Ext.Array.each(this.fieldsToCopy[r],function(r){var a=this._getRelease(t);"FlowState"===r?Rally.util.Ref.getRelativeUri(t.get("Project"))===app.projectRef&&(e[r]=Rally.util.Ref.getRelativeUri(t.get("FlowState"))):!Ext.isEmpty(a)&&Ext.Array.contains(reference_fields,r)?e[r]={_ref:a._ref}:e[r]=t.get(r)},this),t.get("Tags").Count>0){var a=_.map(t.get("Tags")._tagsNameArray,function(e){return{_ref:e._ref}});e.Tags=a}return e},_getRelease:function(e){var t=e.get("Release");return Ext.isEmpty(t)&&this.down("rallyreleasecombobox")&&(t=this.down("rallyreleasecombobox").getRecord().getData()),t},createItem:function(e,t){var r=Ext.create(e.model,e.copy);r.set("Project",app.projectRef),r.save({callback:function(r,a){if(!0===a.success)app.copyList[e.source.get("_ref")]=r.get("_ref"),app.down("#summary").setText("Created "+r.get("FormattedID")),t(null,r);else{console.log("Error:",a);var i="<span class='icon-warning'> </span>Create Error when copying "+e.copy.Name;Ext.isEmpty(a.error)||Ext.isEmpty(a.error.errors)||(i+=":<br/>"+a.error.errors.join("<br/>")),t(i,null)}}})},readCollection:function(e,t){e.reference.getCollection(e.type,{fetch:!0}).load({fetch:!0,callback:function(e,r,a){t(null,e)}})},createList:function(e,t){var r={model:e.raw._type,fetch:!0,filters:[{property:"ObjectID",operator:"=",value:e.get("ObjectID")}]};async.map([r],wsapiQuery,function(e,r){var a=r[0][0];app.list.push(a);var i=null;if(app.defined(a.get("Tasks"))?i="Tasks":app.defined(a.get("Children"))?i="Children":app.defined(a.get("UserStories"))&&(i="UserStories"),app.isObject(i)){var o={reference:a,type:i};async.map([o],app.readCollection,function(e,r){var a=r[0];async.map(a,app.createList,function(e,r){t(null,r)})})}else t(null,a)})},parentRef:function(e){return _.isObject(e.get("Parent"))?{type:"Parent",ref:e.get("Parent")._ref}:_.isObject(e.get("WorkProduct"))?{type:"WorkProduct",ref:e.get("WorkProduct")._ref}:_.isObject(e.get("PortfolioItem"))?{type:"PortfolioItem",ref:e.get("PortfolioItem")._ref}:null},loadModel:function(e,t){Rally.data.ModelFactory.getModel({type:e,success:function(e){t(null,e)}})},isObject:function(e){return!_.isUndefined(e)&&!_.isNull(e)},defined:function(e){return app.isObject(e)&&e.Count>0},wsapiQuery:function(e,t){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,context:{project:null,workspace:app.getContext().getWorkspaceRef()},limit:"Infinity",model:e.model,fetch:e.fetch,filters:e.filters,listeners:{scope:this,load:function(e,r){t(null,r)}}})},_getRequiredFields:function(){var e=Ext.create("Deft.Deferred");return Deft.Promise.all([this._getRequiredFieldsForModel("portfolioitem"),this._getRequiredFieldsForModel("hierarchicalrequirement"),this._getRequiredFieldsForModel("task")]).then({scope:this,success:function(t){e.resolve({portfolioitem:t[0],hierarchicalrequirement:t[1],task:t[2]})}}),e.promise},_getRequiredFieldsForModel:function(e){var t=Ext.create("Deft.Deferred");return Rally.data.ModelFactory.getModel({type:e,success:function(e){var r=e.getFields(),a=[];Ext.Array.each(r,function(e){e.required&&!e.readOnly&&a.push(e.name)}),t.resolve(a)}}),t.promise},getSettingsFields:function(){return[{name:"portfolioitem",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["PortfolioItem/Feature"],margin:"10px 0 10px 0",fieldLabel:"Feature Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"hierarchicalrequirement",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["HierarchicalRequirement"],margin:"10px 0 10px 0",fieldLabel:"Story Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"},{name:"task",xtype:"rallyfieldpicker",autoExpand:!0,alwaysExpanded:!1,modelTypes:["Task"],margin:"10px 0 200px 0",fieldLabel:"Task Fields",_shouldShowField:function(e){var t=e.attributeDefinition;return t&&!t.ReadOnly&&"COLLECTION"!==t.AttributeType},listeners:{ready:function(e){e.collapse()}},readyEvent:"ready"}]},isExternal:function(){return void 0===this.getAppId()},onSettingsUpdate:function(e){console.log("onSettingsUpdate",e),Ext.apply(this,e),this.launch()}});
+                function getReleaseTimeBox(t){var e=t.getContext().getTimeboxScope(),n=null;e?n=e.getRecord().get("Name"):n="";return n}function wsapiQuery(t,e){Ext.create("Rally.data.WsapiDataStore",{autoLoad:!0,limit:"Infinity",context:{project:null,workspace:Rally.environment.getContext().getWorkspaceRef()},model:t.model,fetch:t.fetch,filters:t.filters,listeners:{scope:this,load:function(t,n){e(null,n)}}})}function snapshotQuery(t,e){var n={find:t.find,fetch:t.fetch,hydrate:t.hydrate,autoLoad:!0,pageSize:1e4,limit:"Infinity",listeners:{scope:this,load:function(t,n,o){console.log("snapshots:",n.length),e(null,n)}}};Ext.create("Rally.data.lookback.SnapshotStore",n)}function pointsUnitType(t){return"Points"==t}
 
             Rally.launchApp('CustomApp', {
                 name:"portfolio-item-copy",
-	            parentRepos:""
+                parentRepos:"",
+                version:"1.0.1"
             });
 
         });
diff --git a/package.json b/package.json
index 4ed36dd..fd77caa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "portfolio-item-copy",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "devDependencies": {
       "grunt": "~0.4.1",
diff --git a/utility.js b/utility.js
index be69852..dfb53e3 100644
--- a/utility.js
+++ b/utility.js
@@ -19,6 +19,10 @@ function wsapiQuery( config , callback ) {
     Ext.create('Rally.data.WsapiDataStore', {
         autoLoad : true,
         limit : "Infinity",
+        context: {
+            project: null,
+            workspace: Rally.environment.getContext().getWorkspaceRef()
+        },
         model : config.model,
         fetch : config.fetch,
         filters : config.filters,
