AMENDED AND RESTATED TERMINAL SERVICES AGREEMENT