[device management] improvement