config: Update with latest changes