updated functions and classes in Risk Managment