Intermediate commit with rules structure change