Add Guard support. Turn off clean option by default.