Device handling improved