added claim mechanism