Add TODOs for better build rules