Update with recent additions