Adding exceptions and renaming classes.