Improve ubus support