Added using std::make_shared to the newest 2 apps