Added more attribute names from tc