AMENDED AND RESTATED OMNIBUS AGREEMENT