Preparing to simplify the claim process