Updates

Add multiple device support