Update to use common classes.