Made some class changes.