Partial commit
- New structure applied.