Changed parsing of fields to match changes in the AWS API