Modifications for new build structure