TSU infrastructure improvements