Add TODO for refactoring