Added more invariants