Added new helper classes.