Add consistency checks