Started device refactoring