Switched to pointers internally