Changed contract management. Closes #9.