Update for single device refactoring