Added TODOs based on review comments