Refactored base structure