Update with latest version and structure