Add support for more intrinsics