Added more device support