Changes in object interfaces.
CS.
Refactor after previous changes in interfaces.