Add TODO for modularization.