Added More Claim Protection Preparing For test