Better integerated the classes.