Improved consistency state management