Add more interaction to risk module