Update with Mac support