Updates to indexing and locking of partitions