Updated with latest additions