In the next few days ill open an issue with full mapping of the aws operators and we can discuss each case.    For this specific PR it appears that we are all agreed so @dbarrundiag you can proceed with single file :)