Improvements for GPU