AMENDED AND RESTATED MASTER DEFINITIONS AND CONSTRUCTION AGREEMENT