Add support for arbitrary roots