Decoupled some classes.