agent: Adding TODO for future optimization