Added more stuff to TC integration