Refactored Object structure