Update reqrite scripts/logic to work on per partition basis