Make redaction-based builder generic