Using <memory> and cmdutils.h instead of boost libraries.