Added TODOs for TE class