Index: /applications/editors/josm/plugins/pt_assistant/.settings/org.eclipse.core.resources.prefs
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/.settings/org.eclipse.core.resources.prefs	(revision 33619)
+++ /applications/editors/josm/plugins/pt_assistant/.settings/org.eclipse.core.resources.prefs	(revision 33619)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
Index: /applications/editors/josm/plugins/pt_assistant/build.xml
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/build.xml	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/build.xml	(revision 33619)
@@ -5,5 +5,5 @@
   <property name="commit.message" value="Commit message"/>
   <!-- enter the *lowest JOSM version this plugin is currently compatible with -->
-  <property name="plugin.main.version" value="12823"/>
+  <property name="plugin.main.version" value="12828"/>
 
   <property name="plugin.author" value="Darya Golovko darya0705@gmail.com"/>
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33619)
@@ -17,6 +17,4 @@
 
 import org.openstreetmap.josm.actions.JoinNodeWayAction;
-import org.openstreetmap.josm.actions.SplitWayAction;
-import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.AddCommand;
@@ -24,4 +22,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -136,5 +135,5 @@
 
         if (newNode) {
-            MainApplication.undoRedo.add(new AddCommand(newStopPos));
+            MainApplication.undoRedo.add(new AddCommand(getLayerManager().getEditDataSet(), newStopPos));
         } else {
             MainApplication.undoRedo.add(new ChangeCommand(n, newStopPos));
@@ -159,9 +158,9 @@
             return;
 
-        SplitWayResult result = SplitWayAction.split(getLayerManager().getEditLayer(),
+        SplitWayCommand result = SplitWayCommand.split(
                 affected, Collections.singletonList(newStopPos), Collections.emptyList());
         if (result == null) //if the way is already split, return
             return;
-        MainApplication.undoRedo.add(result.getCommand());
+        MainApplication.undoRedo.add(result);
 
         List<Command> cmds = new ArrayList<>();
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/CreatePlatformNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/CreatePlatformNodeAction.java	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/CreatePlatformNodeAction.java	(revision 33619)
@@ -18,4 +18,5 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -79,7 +80,8 @@
         SortedSet<String> refs = new TreeSet<>();
 
-        MainApplication.undoRedo.add(new AddCommand(dummy1));
-        MainApplication.undoRedo.add(new AddCommand(dummy2));
-        MainApplication.undoRedo.add(new AddCommand(dummy3));
+        DataSet ds = getLayerManager().getEditDataSet();
+        MainApplication.undoRedo.add(new AddCommand(ds, dummy1));
+        MainApplication.undoRedo.add(new AddCommand(ds, dummy2));
+        MainApplication.undoRedo.add(new AddCommand(ds, dummy3));
 
         refs.addAll(populateMap(stopPositionNode));
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33619)
@@ -21,6 +21,4 @@
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.SplitWayAction;
-import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
@@ -28,4 +26,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -111,7 +110,7 @@
         //split the roundabout on the designed nodes
         List<Node> splitNodes = getSplitNodes(roundabout);
-        SplitWayResult result = SplitWayAction.split(getLayerManager().getEditLayer(),
+        SplitWayCommand result = SplitWayCommand.split(
                 roundabout, splitNodes, Collections.emptyList());
-        MainApplication.undoRedo.add(result.getCommand());
+        MainApplication.undoRedo.add(result);
         Collection<Way> splitWays = result.getNewWays();
         splitWays.add(result.getOriginalWay());
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java	(revision 33619)
@@ -8,4 +8,5 @@
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.Command;
@@ -144,5 +145,5 @@
         }
 
-        SelectCommand command = new SelectCommand(primitivesToZoom);
+        SelectCommand command = new SelectCommand(Main.main.getEditDataSet(), primitivesToZoom);
 
         List<OsmDataLayer> listOfLayers = MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class);
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java	(revision 33618)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java	(revision 33619)
@@ -516,11 +516,6 @@
                 primitivesToSelect.add((OsmPrimitive) obj);
             }
-            SelectCommand selectCommand = new SelectCommand(primitivesToSelect);
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    selectCommand.executeCommand();
-                }
-            });
+            SelectCommand selectCommand = new SelectCommand(Main.main.getEditDataSet(), primitivesToSelect);
+            SwingUtilities.invokeLater(() -> selectCommand.executeCommand());
         }