Updates for CUDA support