0.7, use make_shared idiom