Update with latest Boon changes