Added and modified come classes.