Changed public final to private final in model data classes and generated getters.