diff --git a/devices.py b/devices.py
index 3c3be71..02017e8 100755
--- a/devices.py
+++ b/devices.py
@@ -155,15 +155,15 @@ components = [
     },
     {
         "name": "xp",
-        "args": [],
+        "args": [
+            "SAROP21-OPPI103",
+            "SGE-CPCW-72-EVR0:FrontUnivOut15"
+        ],
         "kwargs": {
-            "ID": "SAROP21-OPPI103",
-            "evronoff": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP",
-            "evrsrc": "SGE-CPCW-72-EVR0:FrontUnivOut15-Src-SP",
+            "name": "X-ray pulse picker",
         },
         "z_und": 103,
-        "desc": "X-ray pulse picker",
-        "type": "slic.devices.xoptics.pp:Pulsepick",
+        "type": "slic.devices.xoptics.pulsepicker:PulsePicker",
         "lazy": False,
     },
     {
@@ -377,12 +377,17 @@ components = [
         "lazy": True,
     },
     {
-        "args": ["SLAAR21-LTIM01-EVR0"],
         "name": "laser_shutter",
+        "args": [
+            "SLAAR21-LTIM01-EVR0:FrontUnivOut3_SOURCE"
+        ],
+        "kwargs": {
+            "status_open": 4,
+            "status_closed": 3,
+            "name": "Laser Shutter",
+        },
         "z_und": 142,
-        "desc": "Laser Shutter",
-        "type": "slic.devices.loptics.laser_shutter:laser_shutter",
-        "kwargs": {},
+        "type": "slic.devices.loptics.lasershutter:LaserShutter",
     },
     {
         "args": [],