Get rid of the stub concept
More shared pointers
And even more shared pointers