Updated for Guard 2.0+