Adjusted for 0.1.1 version of contracts