Major refactoring and behavioral changes.