Added new helpful classes.