A method, computer program product, and computing system for identifying one or more first layer metadata blocks that map to one or more second layer metadata blocks. A subset of the second layer metadata blocks that map to another second layer metadata block from the one or more second layer metadata blocks may be identified, thus defining one or more redirecting second layer metadata blocks. For each first layer metadata block of the one or more first layer metadata blocks: One or more first layer metadata blocks that map to the one or more redirecting second layer metadata blocks may be determined and the one or more first layer metadata blocks that map to the one or more redirecting second layer metadata blocks may be remapped to map to a target second layer metadata block.