Added TODO messages