Added EnablePartitioning support