Updated with new SatelliteStore