Fix typo.
Added new helpful classes.
Fix typo.