Revise form contracts