Added a todo comment for future refactoring.