Updated functions to handle java & python, plus support for more