Big change to replace *current-root* variable to support multiple root