Added TODO item to bootstrapper.