Moved from smart pointers to raw pointers