Enhanced AWS related classes.