Added TODO to refactor