Update with latest changes