Add Gaia 2.0 support