Added More device support