Change model and modelClass to private and add getters