Adds support for AWS tag discovery