Restructuring of map build