Add TODOs to config code