Added risk representation to data structure / updated code to go1.1