Add other devices correctly