Add back root support