Adding in java support