Added `Device` to track creation of spots