Several updates to get add claim functionality working again under new architecture