Added ability for different drive types or manual partitioning