Add givt and puppet support