Converted to classes.