Add TODO and dump utility