Include more information from TPB