Modified contracts and some other changes