A lot of changes for OO design.