Updates to match Java version