improved env support and support for Quad ids