Add a TODO for code clarity