General java changes and database update