Separated responsibility for consistency checking