Refactored structure.