Improve contracts