Make gaia more device-aware