Isolated some classes.