Structure refactored