Continued updating code contracts stuff