added Partition support