* Refactored complete structure