Add more gaia branches for testing