Adding Guard support.