Improved full java support for when better externs are completed