Support more devices