Added and updated some classes.