Constants.java changes