Updated contracts for many classes.