Feature/Risk management