modify AWS class and AWSEC2 class.