TRIS refactoring