Added TODO for a reminder in the future refactoring