Added jedi support