Adds support for AWS tags. Fixes #884