Update with recent additions
Pick up recent additions