modify some aws impl classes.