- Removed dependency on shared pointers