Add TODO features