Refactor and fixes on T3 interface