Minor changes - Added TODOs