Application.java changes