Infrastructure Agent refactorings