Why change the claim system? The one introduced in 1.19 on 1.0 seemed well enough to keep around.