Updated models to correct an issue