AMENDED AND RESTATED UNIT AGREEMENT