All Java related code changes