Config cleaning and adding Guard support