Added TODO for potential refactor