Updates to main java files