Updates and fixed risk creation