Updated class files
Merged fixes