Refactored Structure