Added property remapping and pruning.