Changed back to actual classes.