Completed reordering of unit metadata and implementation of proc map.