Added more invariants based on review.