Use claim object instead of tupels

and add api wrapper class