Adds references support to claims