Updating to handle built in global statics folder