Use less shared pointers