Adjustments/changes to device CRUD