Add methods to look at task id and tenant class