Improved claim design