Add modified Class.java
Add modified DataMain.java