Added TODO objectives