Add TU and refacto