Update structure
Resolve merge