Added enums for AWS specific fields