Add Swap support for manual and auto partitionning