More complete Quantum support