Added TODO following code reviews