Change back to using raw pointers