Updated with recent additions