Updated with latest changes from Roots