Feature/risk assessment