Add new risk fields [story:42101093]