Further GAIA refactors