Add TUVBuilder class