Added contract support