Agent Overlap refactoring