Modify init method
Adjust structure