Added Coding Contracts to some Classes