Change to API pointers