Modify headers

make these interfaces more suitable for GPU