improve rust and puppet support