More changes, lowered required Java version