modify some aws implement classes.