Improved AWS discovery to be more exhaustive