Works with latest boon snapshot