Device handling changes