Add cli wrappers to dump output