Minor: added some functions & classes.