Refactored internal state synchronizing