AMENDED AND RESTATED OMNIBUS FEE AGREEMENT