Refactored structures