Adding more AWS checks.