[IAC] Some more refactoring