Refactored object structure