More contract work

- Invariant defined