Changes to migrate to JMP 0.2.0