Api: Update with latest changes