Added additional classes to model json and modified the test program. Still not working for android, but will be done eventually.