Added TODOs for CE