types updated to match model.