Update structure
Refactor init