Add TODOs for future additions