Updated model class files.

All compiled with build.xml, *should* work when running in mcp