Changed to make_shared in CMFactory.