Changes to make the models work with the java version in Android