Remove BC break by returning the claims by leveraging the decode mechanism