Improved functionality for computing risk