Moved the parsing of risk models into risk_models.py