Solution structure refactored