Updated to use jedi 0.7