Update to guard 2.0