Final modifications for helper unit classes.