Move more methods into SatelliteData class