Add TODO note for future development