A lot of Object related refactoring.